diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index 9e3413f98..f3f187d43 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -183,7 +183,11 @@ echo "Changing default configuration to conserve space" cd ${OPENSHIFT_REPO_DIR} util/config system expire_delivery_reports 3 util/config system feed_contacts 0 +util/config system diaspora_enabled 0 util/config system disable_discover_tab 1 +util/config directory safemode 0 +util/config directory globaldir 1 +util/config directory pubforums 0 # Hubzill addons echo "Try to add or update Hubzilla addons" @@ -194,3 +198,8 @@ util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAdd echo "Try to add or update Hubzilla themes" cd ${OPENSHIFT_REPO_DIR} util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes + +# Hubzilla ownMapp +echo "Try to add or update Hubzilla ownMapp" +cd ${OPENSHIFT_REPO_DIR} +util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..583b2a1a8 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,46 @@ +# see http://about.travis-ci.org/docs/user/languages/php/ for more hints +language: php + +# list any PHP version you want to test against +php: + # using major version aliases + + # aliased to a recent 5.4.x version + - 5.4 + # aliased to a recent 5.5.x version + - 5.5 + # aliased to a recent 5.6.x version + - 5.6 + # aliased to a recent 7.x version + - 7.0 + # aliased to a recent hhvm version + - hhvm + +# optionally specify a list of environments, for example to test different RDBMS +#env: +# - DB=mysql +# - DB=pgsql + +# optionally set up exclutions and allowed failures in the matrix +matrix: +# exclude: +# - php: hhvm +# env: DB=pgsql # PDO driver for pgsql is unsupported by HHVM (3rd party install for support) + allow_failures: + - php: 7.0 + - php: hhvm + +# execute any number of scripts before the test run, custom env's are available as variables +#before_script: +# - if [[ "$DB" == "pgsql" ]]; then psql -c "DROP DATABASE IF EXISTS hello_world_test;" -U postgres; fi +# - if [[ "$DB" == "pgsql" ]]; then psql -c "create database hello_world_test;" -U postgres; fi +# - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS hello_world_test;" -uroot; fi + +# omitting "script:" will default to phpunit +# use the $DB env variable to determine the phpunit.xml to use +script: phpunit tests/*php + +# configure notifications (email, IRC, campfire etc) +notifications: +# irc: "irc.freenode.org#yourfavouriteroomfortravis" +# a plugin/script to post to a hubzilla channel would be neat here \ No newline at end of file diff --git a/README.md b/README.md index bd95cd674..b6750480e 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Hubzilla - Community Server Help us redefine the web - using integrated and united community websites. -------------------------------------------------------------------------- +[![Build Status](https://travis-ci.org/redmatrix/hubzilla.svg)](https://travis-ci.org/redmatrix/hubzilla) **What are Hubs?** diff --git a/app/firefoxshare.apd b/app/firefoxshare.apd new file mode 100644 index 000000000..5e0f38b4e --- /dev/null +++ b/app/firefoxshare.apd @@ -0,0 +1,4 @@ +url: $baseurl/ffsapi +requires: local_channel +name: Firefox Share +photo: $baseurl/app/firefoxshare.png diff --git a/app/firefoxshare.png b/app/firefoxshare.png new file mode 100644 index 000000000..755952284 Binary files /dev/null and b/app/firefoxshare.png differ diff --git a/boot.php b/boot.php index cdf3c302b..f9b826bb7 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,8 @@ define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1158 ); +define ( 'DB_UPDATE_VERSION', 1160 ); + /** * @brief Constant with a HTML line break. @@ -79,7 +80,7 @@ define ( 'DIRECTORY_FALLBACK_MASTER', 'https://zothub.com'); $DIRECTORY_FALLBACK_SERVERS = array( 'https://zothub.com', - 'https://zotid.net', + 'https://hubzilla.site', 'https://red.zottel.red', 'https://gravizot.de', 'https://my.federated.social' @@ -936,26 +937,6 @@ class App { return $this->groups; } - function set_widget($title,$html, $location = 'aside') { - $this->widgets[] = array('title' => $title, 'html' => $html, 'location' => $location); - } - - function get_widgets($location = '') { - if($location && count($this->widgets)) { - $ret = array(); - foreach($this->widgets as $w) { - if ($w['location'] == $location) - $ret[] = $w; - } - $arr = array('location' => $location, 'widgets' => $ret); - call_hooks('get_widgets', $arr); - return $arr['widgets']; - } - $arr = array('location' => $location, 'widgets' => $this->widgets); - call_hooks('get_widgets', $arr); - return $arr['widgets']; - } - function set_pager_total($n) { $this->pager['total'] = intval($n); } @@ -2075,17 +2056,6 @@ function construct_page(&$a) { $a->build_pagehead(); - $arr = $a->get_widgets(); - ksort($arr, SORT_NUMERIC); - if(count($arr)) { - foreach($arr as $x) { - if(! array_key_exists($x['location'], $a->page)) - $a->page[$x['location']] = ''; - - $a->page[$x['location']] .= $x['html']; - } - } - // Let's say we have a comanche declaration '[region=nav][/region][region=content]$nav $content[/region]'. // The text 'region=' identifies a section of the layout by that name. So what we want to do here is leave // $a->page['nav'] empty and put the default content from $a->page['nav'] and $a->page['section'] diff --git a/doc/Hooks.md b/doc/Hooks.md deleted file mode 100644 index 90edff623..000000000 --- a/doc/Hooks.md +++ /dev/null @@ -1,136 +0,0 @@ -Hooks - Complete List -===================== - - -* 'about_hook' -* 'account_settings' -* 'app_menu' -* 'atom_author' -* 'atom_entry' -* 'atom_feed' -* 'atom_feed_end' -* 'authenticate' -* 'avatar_lookup' -* 'bb2diaspora' -* 'bbcode' -* 'channel_remove' -* 'check_account_email' -* 'check_account_invite' -* 'check_account_password' -* 'connect_premium' -* 'connector_settings' -* 'contact_block_end' -* 'contact_edit' -* 'contact_edit_post' -* 'contact_photo_menu' -* 'contact_select_options' -* 'conversation_start' -* 'cron' -* 'directory_item' -* 'display_item' -* 'display_item' -* 'display_settings' -* 'display_settings_post' -* 'enotify' -* 'enotify_mail' -* 'enotify_store' -* 'event_created' -* 'event_updated' -* 'feature_enabled' -* 'feature_settings' -* 'feature_settings_post' -* 'follow' -* 'gender_selector' -* 'get_all_perms' -* 'get_features' -* 'get_widgets' -* 'global_permissions' -* 'home_content' -* 'home_init' -* 'html2bbcode' -* 'import_directory_profile' -* 'init_1' -* 'item_photo_menu' -* 'item_translate' -* 'jot_networks' -* 'jot_tool' -* 'logged_in' -* 'login_hook' -* 'logging_out' -* 'magic_auth' -* 'magic_auth_success' -* 'main_slider' -* 'marital_selector' -* 'mood_verbs' -* 'network_content_init' -* 'network_ping' -* 'network_tabs' -* 'network_to_name' -* 'notifier_end' -* 'notifier_normal' -* 'obj_verbs' -* 'oembed_probe' -* 'page_content_top' -* 'page_end' -* 'page_header' -* 'parse_atom' -* 'parse_link' -* 'pdl_selector' -* 'perm_is_allowed' -* 'personal_xrd' -* 'photo_post_end' -* 'photo_post_end' -* 'photo_upload_begin' -* 'photo_upload_end' -* 'photo_upload_file' -* 'photo_upload_form' -* 'poke_verbs' -* 'post_local' -* 'post_local_end' -* 'post_local_start' -* 'post_mail' -* 'post_mail_end' -* 'post_remote' -* 'post_remote_end' -* 'post_remote_update' -* 'post_remote_update_end' -* 'prepare_body' -* 'prepare_body_final' -* 'prepare_body_init' -* 'proc_run' -* 'profile_advanced' -* 'profile_edit' -* 'profile_post' -* 'profile_sidebar' -* 'profile_sidebar_enter' -* 'profile_tabs' -* 'register_account' -* 'render_location' -* 'settings_account' -* 'settings_form' -* 'settings_post' -* 'sexpref_selector' -* 'smilie' -* 'validate_channelname' -* 'webfinger' -* 'zid' -* 'zid_init' - -***General Module Hooks*** - -* $a->module . '_mod_aftercontent' -* $a->module . '_mod_aside' -* $a->module . '_mod_content' -* $a->module . '_mod_init' -* $a->module . '_mod_post' - -***General Selector Hooks*** - -* $a->module . '_post_' . $selname -* $a->module . '_post_' . $selname -* $a->module . '_post_' . $selname -* $a->module . '_pre_' . $selname -* $a->module . '_pre_' . $selname -* $a->module . '_pre_' . $selname - -#include doc/macros/main_footer.bb; diff --git a/doc/Hubzilla_on_OpenShift.bb b/doc/Hubzilla_on_OpenShift.bb index db61c3a48..9b2c539dc 100644 --- a/doc/Hubzilla_on_OpenShift.bb +++ b/doc/Hubzilla_on_OpenShift.bb @@ -1,7 +1,9 @@ [b]Hubzilla on OpenShift[/b] You will notice a new .openshift folder when you fetch from upstream, i.e. from [url=https://github.com/redmatrix/hubzilla.git]https://github.com/redmatrix/hubzilla.git[/url] , which contains a deploy script to set up Hubzilla on OpenShift with plugins and extra themes. -Create an account on OpenShift, then use the registration e-mail and password to create your first Hubzilla instance. Install git and RedHat's command line tools - rhc - if you have not already done so. +As of this writing, 2015-10-28, you do not have to pay for OpenShift on the Free plan, which gives you three gears at no cost. The Bronze plan gives you three gears at no cost too, but you can expand to 16 gears by paying, and this requires you to register your payment card. The three gears can give three instances of Hubzilla with one gear each, or you can combine two gears into one high-availability Hubzilla instance and one extra gear. The main difference to be aware of is this: gears on the Free plan will go into hibernation if left idle for too long, this does not happen on the Bronze plan. + +Create an account on OpenShift, then use the registration e-mail and password to create your first Hubzilla instance. Install git and RedHat's command line tools - rhc - if you have not already done so. See for example https://developers.openshift.com/en/getting-started-debian-ubuntu.html on how to do this on Debian GNU/Linux, or in the menu on that page for other GNU/Linux distributions or other operating systems. [code]rhc app-create your_app_name php-5.4 mysql-5.5 cron phpmyadmin --namespace your_domain --from-code https://github.com/redmatrix/hubzilla.git -l your@email.address -p your_account_password [/code] diff --git a/doc/addons.bb b/doc/addons.bb index 1be88150d..a6d2cfc2f 100644 --- a/doc/addons.bb +++ b/doc/addons.bb @@ -42,7 +42,7 @@ [*] qrator - generate QR code images [*] rainbowtag - display your tag and category clouds in colours [*] randpost - post/reply bot based on and requires fortunate -[*] redred - Crosspost to another Redmatrix or Hubzilla channel +[*] redred - Crosspost to another Red Matrix or Hubzilla channel [*] rtof - Crosspost to Friendica [*] smiley_pack - extend the built-in smilie (emoticon) support [*] smileybutton - provides a smiley selector on the post window diff --git a/doc/admins.bb b/doc/admins.bb index c77b004a4..484212024 100644 --- a/doc/admins.bb +++ b/doc/admins.bb @@ -9,6 +9,7 @@ [zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl] [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl] [zrl=[baseurl]/help/service_classes]Service Classes[/zrl] +[zrl=[baseurl]/help/directories]Working with and configuring Directories[/zrl] [zrl=[baseurl]/help/theme_management]Theme Management[/zrl] diff --git a/doc/bbcode.html b/doc/bbcode.html index 4fe47842f..3e9bda1d9 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -7,11 +7,11 @@
  • [u]underlined[/u] - underlined
  • [s]strike[/s] - strike
  • [color=red]red[/color] - red
    -
  • [url=https://redmatrix.me]$Projectname[/url] $Projectname
    -
  • [img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    -
  • [img float=left]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    +
  • [url=https://zothub.com]$Projectname[/url] $Projectname
    +
  • [img]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    +
  • [img float=left]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    -
  • [img float=right]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    +
  • [img float=right]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
  • [code]code[/code] code
  • [quote]quote[/quote]
    quote

    @@ -50,8 +50,8 @@

    $Projectname specific codes

    -{{/if}} \ No newline at end of file +{{/if}} + diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl index 3c6a4be30..3c8a54373 100644 --- a/view/tpl/sources_new.tpl +++ b/view/tpl/sources_new.tpl @@ -1,3 +1,4 @@ +

    {{$title}}

    {{$desc}}
    @@ -11,5 +12,5 @@
    - +