version bump

(cherry picked from commit 5a46f1229d)

.gitlab-ci.yml

@@ -1,6 +1,6 @@
 # Select image from https://hub.docker.com/_/php/
 #image: php:7.2
-# Use a prepared Hubzilla image to optimise pipeline duration
+# Use a prepared Hubzilla image to optimise pipeline run
 image: registry.gitlab.com/dawnbreak/hubzilla/core:php7.2
 
 
@@ -32,28 +32,55 @@ variables:
 
 
 before_script:
-# pecl and composer do not work with PHP production restrictions (from Hubzilla Docker image)
-- if [ -f /usr/local/etc/php/conf.d/z_prod.ini ]; then mv /usr/local/etc/php/conf.d/z_prod.ini /usr/local/etc/php/conf.d/z_prod.ini.off; fi
 # Install & enable Xdebug for code coverage reports
 - pecl install xdebug
 - docker-php-ext-enable xdebug
 # Install composer
 - curl -sS https://getcomposer.org/installer | php
 # Install dev libraries from composer
-- php ./composer.phar install --no-progress
+- php composer.phar install --no-progress
 
 
-# hidden job definition with template for MySQL/MariaDB
-.job_template_mysql: &job_definition_mysql
+# test PHP7 with MySQL 5.7
+php7.2_mysql 1/2:
   stage: test
+  services:
+  - mysql:5.7
   script:
   - echo "USE $MYSQL_DATABASE; $(cat ./install/schema_mysql.sql)" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE"
   - echo "SHOW DATABASES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE"
   - echo "USE $MYSQL_DATABASE; SHOW TABLES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE"
   - vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-text
 
-# hidden job definition with template for PostgreSQL
-.job_template_postgres: &job_definition_postgres
+
+# test PHP7 with MySQL latest (8)
+php7.2_mysql 2/2:
+  stage: test
+  services:
+  - name: mysql:latest
+    command: ["--default-authentication-plugin=mysql_native_password"]
+  script:
+  - echo "USE $MYSQL_DATABASE; $(cat ./install/schema_mysql.sql)" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE"
+  - echo "SHOW DATABASES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE"
+  - echo "USE $MYSQL_DATABASE; SHOW TABLES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE"
+  - vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-text
+
+
+# test PHP7 with MariaDB latest (10.3)
+php7.2_mariadb:
+  stage: test
+  services:
+  - name: mariadb:latest
+    alias: mysql
+  script:
+  - echo "USE $MYSQL_DATABASE; $(cat ./install/schema_mysql.sql)" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE"
+  - echo "SHOW DATABASES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE"
+  - echo "USE $MYSQL_DATABASE; SHOW TABLES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE"
+  - vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-text
+
+
+# test PHP7 with PostgreSQL latest
+php7.2_postgres:
   stage: test
   services:
   - postgres:latest
@@ -68,10 +95,7 @@ before_script:
   #- psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "\dt;"
   # Run the actual tests
   - vendor/bin/phpunit --configuration tests/phpunit-pgsql.xml --testdox
-
-# hidden job definition with artifacts config template
-.artifacts_template:
-  artifacts: &artifacts_template
+  artifacts:
     expire_in: 1 week
     # Gitlab should show the results, but has problems parsing PHPUnit's junit file.
     reports:
@@ -82,52 +106,7 @@ before_script:
       - tests/results/
 
 
-# PHP7.2 with MySQL 5.7
-php7.2_mysql5.7:
-  <<: *job_definition_mysql
-  services:
-  - mysql:5.7
-
-
-# PHP7.2 with MySQL 8 (latest)
-php7.2_mysql8:
-  <<: *job_definition_mysql
-  services:
-  - name: mysql:8
-    command: ["--default-authentication-plugin=mysql_native_password"]
-
-
-# PHP7.2 with MariaDB 10.2
-php7.2_mariadb10.2:
-  <<: *job_definition_mysql
-  services:
-  - name: mariadb:10.2
-    alias: mysql
-
-
-# PHP7.3 with MariaDB 10.3 (latest)
-php7.3_mariadb10.3:
-  <<: *job_definition_mysql
-  image: registry.gitlab.com/dawnbreak/hubzilla/core:php7.3
-  services:
-  - name: mariadb:10.3
-    alias: mysql
-
-
-# PHP7.2 with PostgreSQL latest (11)
-php7.2_postgres11:
-  <<: *job_definition_postgres
-  artifacts: *artifacts_template
-
-
-# PHP7.3 with PostgreSQL latest (11)
-php7.3_postgres11:
-  <<: *job_definition_postgres
-  image: registry.gitlab.com/dawnbreak/hubzilla/core:php7.3
-  artifacts: *artifacts_template
-
-
-# Generate Doxygen API Documentation and deploy it as GitLab pages
+# Generate Doxygen API Documentation and deploy it at GitLab pages
 pages:
   stage: deploy
   cache: {}

.homeinstall/README.md

@@ -1,10 +1,23 @@
-# How to use
+# Hubzilla at Home next to your Router
+
+Run hubzilla-setup.sh for an unattended installation of hubzilla.
+
+The script is known to work without adjustments with
+
++ Hardware
+  - Mini-PC with Debian-9.5-amd64, or
+  - Rapberry 3 with Raspbian, Debian-9.5
++ DynDNS
+  - selfHOST.de
+  - freedns.afraid.org
 
 ## Disclaimers
 
-- This script does work with Debian 10 only.
+- This script does work with Debian 9 only.
 - This script has to be used on a fresh debian install only (it does not take account for a possibly already installed and configured webserver or sql implementation).
 
+# Step-by-Step Overwiew
+
 ## Preconditions
 
 Hardware
@@ -15,10 +28,10 @@ Hardware
 
 Software
 
-+ Fresh installation of Debian 10 (Stretch)
-+ Router with open ports 80 and 443 for your web server
++ Fresh installation of Debian 9 (Stretch)
++ Router with open ports 80 and 443 for your Hub
 
-## How to run the script
+## The basic steps (quick overview)
 
 + Register your own domain (for example at selfHOST) or a free subdomain (for example at freeDNS)
 + Log on to your fresh Debian
@@ -31,11 +44,19 @@ Software
   - nano hubzilla-config.txt
     - Read the comments carefully
     - Enter your values: db pass, domain, values for dyn DNS
-    - Prepare your external disk for backups
+  - Make sure your external drive (for backups) is mounted
   - hubzilla-setup.sh as root
     - ... wait, wait, wait until the script is finised
+  - reboot
 + Open your domain with a browser and step throught the initial configuration of hubzilla.
 
+## Troubleshooting
+
+If the check of the mail address fails when you try to register the very first user in the browser. Do...
+
+    cd /var/www/html
+    util/config system.do_not_check_dns 1
+
 ## Optional - Set path to imagemagick
 
 In Admin settings of hubzilla or via terminal
@@ -43,74 +64,60 @@ In Admin settings of hubzilla or via terminal
     cd /var/www/html
     util/config system.imagick_convert_path /usr/bin/convert
 
-## Optional - Switch verification of email on/off
+# Step-by-Step in Detail
 
-Do this just befor you register the user.
+## Preparations Hardware
 
-In Admin settings of hubzilla or via terminal
+### Mini-PC
 
-    cd /var/www/html
+### Recommended: USB Drive for Backups
 
-Check the current setting 
+The installation will create a daily backup written to an external drive.
 
-    util/config system verify_email
+The USB drive must be compatible with the filesystems
 
-Switch the verification on/off (1/0)
+- ext4 (if you do not want to encrypt the USB) 
+- LUKS + ext4 (if you want to encrypt the USB) 
 
-    util/config system verify_email 0
+The backup includes 
 
-## What the script will do for you...
+- Hubzilla DB
+- Hubzilla installation /var/www/html
+- Certificates for letsencrypt
 
-+ install everything required by Hubzilla, basically a web server (Apache), PHP, a database (MySQL), certbot,...
-+ create a database
-+ run certbot to have everything for a secure connection (httpS)
-+ create a script for daily maintenance
-  - backup to external disk (certificates, database, /var/www/)
-  - renew certfificate (letsencrypt)
-  - update of Hubzilla
-  - update of Debian
-  - restart
-+ create cron jobs for
-  - DynDNS (selfHOST.de or freedns.afraid.org) every 5 minutes
-  - Master.php for Zap/Hubzilla every 10 minutes
-  - daily maintenance script every day at 05:30
+## Preparations Software
 
-The script is known to work without adjustments with
+### Install Debian Linux on the Mini-PC
 
-+ Hardware
-  - Mini-PC with Debian 10 (stretch), or
-  - Rapberry 3 with Raspbian, Debian 10
-+ DynDNS
-  - selfHOST.de
-  - freedns.afraid.org
+Download the stable Debian at https://www.debian.org/  
+(Debian 8 is no longer supported.)
 
-The script can install both [Hubzilla](https://zotlabs.org/page/hubzilla/hubzilla-project) and [Zap](https://zotlabs.com/zap/). Make sure to use the correct GIT repositories.  
+Create bootable USB drive with Debian on it.You could use
 
-+ Hubzilla
-  - core: git clone https://framagit.org/hubzilla/core.git html (in this readme)
-  - addons: util/add_addon_repo https://framagit.org/hubzilla/addons.git hzaddons (in hubzilla-setup.sh)
-+ Zap
-  - core: git clone https://framagit.org/zot/zap.git html (in this readme)
-  - addons: util/add_addon_repo https://framagit.org/zot/zap-addons.git zaddons (in hubzilla-setup.sh)
+- unetbootin, https://en.wikipedia.org/wiki/UNetbootin
+- or simply the linux command "dd"
+
+Example for command dd...
+
+    su -
+    dd if=2018-10-09-raspbian-stretch.img of=/dev/mmcblk0
+
+Do not forget to unmount the SD card before and check if unmounted like in this example...
+
+    su -
+    umount /dev/mmcblk0*
+    df -h
 
 
+Switch off your mini pc, plug in your USB drive and start the mini pc from the
+stick. Install Debian. Follow the instructions of the installation.
 
-# Step-by-Step - some Details
+### Configure your Router
 
-## Preparations
-
-## Configure your Router
-
-Your web has to be visible in the internet.  
-
-Open the ports 80 and 443 on your router for your Debian. Make sure your web server is marked as "exposed host".
+Open the ports 80 and 443 on your router for your Debian
 
 ## Preparations Dynamic IP Address
 
-Follow the instructions in .homeinstall/hubzilla-config.txt.  
-
-In short...  
-
 Your Hubzilla must be reachable by a domain that you can type in your browser
 
     cooldomain.org
@@ -125,15 +132,105 @@ There are two ways to get a domain...
 
 ...for example buy at selfHOST.de  
 
-The cost is 1,50 € per month (2019).
+The cost are around 10,- € once and 1,50 € per month (2017).
 
 ### Method 2: Register a free subdomain
 
 ...for example register at freedns.afraid.org
 
-## Note on Rasperry 
+Follow the instructions in .homeinstall/hubzilla-config.txt.  
 
-The script was tested with an Raspberry 3 under Raspian, Debian 10.
+
+## Install Hubzilla on your Debian
+
+Login to your debian
+(Provided your username is "you" and the name of the mini pc is "debian". You
+could take the IP address instead of "debian")
+
+    ssh -X you@debian
+
+Change to root user
+
+    su -l
+
+Install git
+
+    apt-get install git
+
+Make the directory for apache and change diretory to it
+
+    mkdir /var/www
+    cd /var/www/
+
+Clone hubzilla from git ("git pull" will update it later)
+
+    git clone https://framagit.org/hubzilla/core.git  html
+
+Change to the install script
+
+    cd html/.homeinstall/
+    
+Copy the template file
+    
+    cp hubzilla-config.txt.template hubzilla-config.txt
+
+Modify the file "hubzilla-config.txt". Read the instructions there carefully and enter your values.
+
+    nano hubzilla-config.txt
+
+Make sure your external drive (for backups) is plugged in and can be mounted as configured in "hubzilla-config.txt". Otherwise the daily backups will not work.
+
+Run the script
+
+     ./hubzilla-setup.sh
+
+Wait... The script should not finish with an error message.
+
+In a webbrowser open your domain.
+Expected: A test page of hubzilla is shown. All checks there should be
+successfull. Go on...
+Expected: A page for the Hubzilla server configuration shows up.
+
+Leave db server name "127.0.0.1" and port "0" untouched.
+
+Enter
+
+- DB user name = hubzilla
+- DB pass word = This is the password you entered in "hubzilla-config.txt"
+- DB name = hubzilla
+
+Leave db type "MySQL" untouched.
+
+Follow the instructions in the next pages.
+
+Recommended: Set path to imagemagick
+
+- in admin settings of hubzilla or 
+- via terminal
+
+    util/config system.imagick_convert_path /usr/bin/convert
+
+After the daily script was executed at 05:30 (am)
+
+- look at /var/www/html/hubzilla-daily.log
+- check your backup on the external drive
+- optionally view the daily log under yourdomain.org/admin/logs/
+  - set the logfile to var/www/html/hubzilla-daily.log
+
+
+## Install Hubzilla in a Virtual Machine for Test Purposes
+
+Modify the file "hubzilla-config.txt".
+
+    nano hubzilla-config.txt
+
+There use 
+
+    le_domain=localhost
+
+## Note for the Rasperry 
+
+The script was tested with an Raspberry 3 under Raspian (Debian 9.5, 2018-10-09-raspbian-stretch.img).
 
 It is recommended to run the Raspi without graphical frontend (X-Server). Use...
 
@@ -143,5 +240,12 @@ to boot the Rapsi to the client console.
 
 DO NOT FORGET TO CHANGE THE DEFAULT PASSWORD FOR USER PI!
 
+If the validation of the mail address fails for the very first registered user...  
+This used to happen on some *bsd distros but there was some work to fix that a year ago (2017).
+
+So if your system isn't registered in DNS or DNS isn't active do
+
+    cd /var/www/html
+    util/config system.do_not_check_dns 1
 
 

.homeinstall/hubzilla-config.txt.template

@@ -2,8 +2,8 @@
 ### MANDATORY - database password #############
 #
 # Please give your database password
-# It is better to not use blanks inside the password.
 #   Example: db_pass=pass_word_with_no_blanks_in_it
+#   Example: db_pass="this password has blanks in it"
 db_pass=
 
 ###############################################
@@ -18,12 +18,9 @@ db_pass=
 #     Example: my.cooldomain.org
 #     Example: cooldomain.org
 #
-# You might use "localhost" for a LOCAL TEST installation.
-# This is usefull if you want to debug the server inside a VM.
+#     Example: localhost (test installation without certificates for httpS)
 #
-#     Example: localhost
-#
-# Email is optional if you use "localhost".
+# Email is optional
 #
 #
 le_domain=
@@ -33,7 +30,7 @@ le_email=
 ### OPTIONAL - selfHOST - dynamic IP address ##
 #
 # 1. Register a domain at selfhost.de
-#    - choose offer "DOMAIN dynamisch" 1,50€/mon at 04/2019
+#    - choose offer "DOMAIN dynamisch" 1,50€/mon at 08.01.2016
 # 2. Get your configuration for dynamic IP update
 #    - Log in at selfhost.de
 #    - go to "DynDNS Accounte"

.homeinstall/hubzilla-setup.sh

@@ -3,10 +3,7 @@
 # How to use
 # ----------
 # 
-# This file automates the installation of
-# - hubzilla: https://zotlabs.org/page/hubzilla/hubzilla-project and
-# - zap: https://zotlabs.com/zap/
-# under Debian Linux
+# This file automates the installation of hubzilla under Debian Linux
 #
 # 1) Copy the file "hubzilla-config.txt.template" to "hubzilla-config.txt"
 #       Follow the instuctions there
@@ -26,15 +23,18 @@
 # - install
 #        * apache webserer, 
 #        * php,  
-#        * mariadb - the database for hubzilla,  
-#        * adminer,  
-#        * git to download and update addons
+#        * mysql - the database for hubzilla,  
+#        * phpmyadmin,  
+#        * git to download and update hubzilla itself
+# - download hubzilla core and addons
 # - configure cron
-#        * "Master.php" for regular background prozesses of hubzilla
-#        * "apt-get update" and "apt-get dist-upgrade" and "apt-get autoremove" to keep linux up-to-date
-#        * run command to keep the IP up-to-date > DynDNS provided by selfHOST.de or freedns.afraid.org
-#        * backup hubzillas database and files (rsync)
-# - run letsencrypt to create, register and use a certifacte for https
+#        * "poller.php" for regular background prozesses of hubzilla
+#        * to_do "apt-get update" and "apt-get dist-upgrade" to keep linux
+#          up-to-date
+#        * to_do backup hubzillas database and files (rsnapshot)
+# - configure dynamic ip with cron
+# - to_do letsencrypt
+# - to_do redirection to https
 # 
 # 
 # Discussion
@@ -44,6 +44,26 @@
 # - The script runs into installation errors for phpmyadmin if it uses
 #   different passwords. For the sake of simplicity one singel password.
 # 
+# Security - suhosin for PHP
+# - The script does not install suhosin.
+# - Is the security package suhosin usefull or not usefull?
+#
+# Hubzilla - email verification
+# - The script switches off email verification off in all htconfig.tpl.
+#   Example: /var/www/html/view/en/htconfig.tpl
+# - Is this a silly idea or not?
+#
+# 
+# Remove Hubzilla (for a fresh start using the script)
+# ----------------------------------------------------
+#
+# You could use /var/www/hubzilla-remove.sh
+# that is created by hubzilla-setup.sh.
+#
+# The script will remove (almost everything) what was installed by the script.
+# After the removal you could run the script again to have a fresh install
+# of all applications including hubzilla and its database.
+# 
 # How to restore from backup
 # --------------------------
 #
@@ -55,11 +75,19 @@
 # - creates a daily cron that runs the hubzilla-daily.sh
 #
 # hubzilla-daily.sh makes a (daily) backup of all relevant files
-# - /var/lib/mysql/ > database
-# - /var/www/ > hubzilla/zap from github
-# - /etc/letsencrypt/ > certificates
+# - /var/lib/mysql/ > hubzilla database
+# - /var/www/html/ > hubzilla from github
+# - /var/www/letsencrypt/ > certificates
 # 
-# hubzilla-daily.sh writes the backup to an external disk compatible to LUKS+ext4 (see hubzilla-config.txt)
+# hubzilla-daily.sh writes the backup
+# - either to an external disk compatible to LUKS+ext4 (see hubzilla-config.txt)
+# - or to /var/cache/rsnapshot in case the external disk is not plugged in
+# 
+# Restore backup
+# - - - - - - - 
+# 
+# This was not tested yet.
+# Bacically you can copy the files from the backup to the server.
 # 
 # Credits
 # -------
@@ -67,6 +95,8 @@
 # The script is based on Thomas Willinghams script "debian-setup.sh"
 # which he used to install the red#matrix.
 #
+# The script uses another script from https://github.com/lukas2511/letsencrypt.sh
+#
 # The documentation for bash is here
 # https://www.gnu.org/software/bash/manual/bash.html
 #
@@ -86,9 +116,9 @@ function check_sanity {
     then
         die "Debian is supported only"
     fi
-    if ! grep -q 'Linux 10' /etc/issue
+    if ! grep -q 'Linux 9' /etc/issue
     then
-        die "Linux 10 (buster) is supported only"x
+        die "Linux 9 (stretch) is supported only"x
     fi
 }
 
@@ -106,11 +136,11 @@ function check_config {
     # backup is important and should be checked
 	if [ -n "$backup_device_name" ]
 	then
-		if [ ! -d "$backup_mount_point" ]
-		then
-			mkdir "$backup_mount_point"
-		fi
-		device_mounted=0
+            if [ ! -d "$backup_mount_point" ]
+            then
+                mkdir "$backup_mount_point"
+	    fi
+            device_mounted=0
 		if fdisk -l | grep -i "$backup_device_name.*linux"
 		then
 		    print_info "ok - filesystem of external device is linux"
@@ -199,17 +229,21 @@ function print_warn {
 }
 
 function stop_hubzilla {
-    print_info "stopping apache webserver..."
-    systemctl stop apache2
-    print_info "stopping mysql db..."
-    systemctl stop mariadb
+    if [ -d /etc/apache2 ]
+    then
+        print_info "stopping apache webserver..."
+        service apache2 stop
+    fi
+    if [ -f /etc/init.d/mysql ]
+    then
+        print_info "stopping mysql db..."
+        /etc/init.d/mysql stop
+    fi
 }
 
 function install_apache {
     print_info "installing apache..."
     nocheck_install "apache2 apache2-utils"
-    a2enmod rewrite
-    systemctl restart apache2
 }
 
 function install_imagemagick {
@@ -222,11 +256,6 @@ function install_curl {
     nocheck_install "curl"
 }
 
-function install_wget {
-    print_info "installing wget..."
-    nocheck_install "wget"
-}
-
 function install_sendmail {
     print_info "installing sendmail..."
     nocheck_install "sendmail sendmail-bin"
@@ -235,47 +264,65 @@ function install_sendmail {
 function install_php {
     # openssl and mbstring are included in libapache2-mod-php
     print_info "installing php..."
-    nocheck_install "libapache2-mod-php php php-pear php-curl php-gd php-mysqli php-mbstring php-xml php-zip"
-    sed -i "s/^upload_max_filesize =.*/upload_max_filesize = 100M/g" /etc/php/7.3/apache2/php.ini
-    sed -i "s/^post_max_size =.*/post_max_size = 100M/g" /etc/php/7.3/apache2/php.ini
+    nocheck_install "libapache2-mod-php php php-pear php-curl php-mcrypt php-gd"
+    sed -i "s/^upload_max_filesize =.*/upload_max_filesize = 100M/g" /etc/php/7.0/apache2/php.ini
+    sed -i "s/^post_max_size =.*/post_max_size = 100M/g" /etc/php/7.0/apache2/php.ini
 }
 
 function install_mysql {
+    # http://www.microhowto.info/howto/perform_an_unattended_installation_of_a_debian_package.html
+    # 
+    # To determine the required package name, key and type you can perform
+    # a trial installation then search the configuration database.
+    # 
+    #     debconf-get-selections | grep mysql-server
+    #
+    # The command debconf-get-selections is provided by the package
+    # debconf-utils, which you may need to install.
+    #
+    #    apt-get install debconf-utils
+    #
+    # If you want to supply an answer to a configuration question but do not 
+    # want to be prompted for it then this can be arranged by preseeding the
+    # DebConf database with the required information.
+    #
+    #     echo mysql-server mysql-server/root_password password xyzzy | debconf-set-selections
+    #     echo mysql-server mysql-server/root_password_again password xyzzy | debconf-set-selections
+    #
     print_info "installing mysql..."
     if [ -z "$mysqlpass" ]
     then
         die "mysqlpass not set in $configfile"
     fi
-	if type mysql ; then
-		echo "Yes, mysql is installed"
-	else
-		echo "mariadb-server"
-		nocheck_install "mariadb-server"
-        systemctl status mariadb
-        systemctl start mariadb
-        mysql --user=root <<_EOF_
-UPDATE mysql.user SET Password=PASSWORD('${db_root_password}') WHERE User='root';
-DELETE FROM mysql.user WHERE User='';
-DROP DATABASE IF EXISTS test;
-DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%';
-FLUSH PRIVILEGES;
-_EOF_
-    fi    
+    echo mysql-server mysql-server/root_password password $mysqlpass | debconf-set-selections
+    echo mysql-server mysql-server/root_password_again password $mysqlpass | debconf-set-selections
+    nocheck_install "php-mysql mysql-server mysql-client"
 }
 
-function install_adminer {
-    print_info "installing adminer..."
-    nocheck_install "adminer"
-    if [ ! -f /etc/adminer/adminer.conf ]
+function install_phpmyadmin {
+    print_info "installing phpmyadmin..."
+    if [ -z "$phpmyadminpass" ]
     then
-        echo "Alias /adminer /usr/share/adminer/adminer" > /etc/adminer/adminer.conf
-        ln -s /etc/adminer/adminer.conf /etc/apache2/conf-available/adminer.conf
-    else
-        print_info "file /etc/adminer/adminer.conf exists already"
+        die "phpmyadminpass not set in $configfile"
     fi
+    echo phpmyadmin    phpmyadmin/setup-password password $phpmyadminpass | debconf-set-selections
+    echo phpmyadmin    phpmyadmin/mysql/app-pass password $phpmyadminpass | debconf-set-selections
+    echo phpmyadmin    phpmyadmin/app-password-confirm password $phpmyadminpass | debconf-set-selections
+    echo phpmyadmin    phpmyadmin/mysql/admin-pass    password $phpmyadminpass | debconf-set-selections
+    echo phpmyadmin    phpmyadmin/password-confirm    password $phpmyadminpass | debconf-set-selections
+    echo phpmyadmin    phpmyadmin/reconfigure-webserver multiselect apache2 | debconf-set-selections
+    nocheck_install "phpmyadmin"
+
+    # It seems to be not neccessary to check rewrite.load because it comes
+    # with the installation. To be sure you could check this manually by:
+    #
+    #    nano /etc/apache2/mods-available/rewrite.load
+    #
+    # You should find the content:
+    #
+    #    LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
 
     a2enmod rewrite
-
     if [ ! -f /etc/apache2/apache2.conf ]
     then
         die "could not find file /etc/apache2/apache2.conf"
@@ -283,10 +330,12 @@ function install_adminer {
     sed -i \
         "s/AllowOverride None/AllowOverride all/" \
         /etc/apache2/apache2.conf
-
-    a2enconf adminer
-    systemctl restart mariadb
-    systemctl reload apache2
+    if [ -z "`grep 'Include /etc/phpmyadmin/apache.conf' /etc/apache2/apache2.conf`" ]
+    then
+        echo "Include /etc/phpmyadmin/apache.conf" >> /etc/apache2/apache2.conf
+    fi
+    service apache2 restart
+    /etc/init.d/mysql start
 }
 
 function create_hubzilla_db {
@@ -303,7 +352,6 @@ function create_hubzilla_db {
     then
         die "hubzilla_db_pass not set in $configfile"
     fi
-    systemctl restart mariadb
     Q1="CREATE DATABASE IF NOT EXISTS $hubzilla_db_name;"
     Q2="GRANT USAGE ON *.* TO $hubzilla_db_user@localhost IDENTIFIED BY '$hubzilla_db_pass';"
     Q3="GRANT ALL PRIVILEGES ON $hubzilla_db_name.* to $hubzilla_db_user@localhost identified by '$hubzilla_db_pass';"
@@ -401,11 +449,11 @@ function configure_cron_selfhost {
     print_info "configure cron for selfhost..."
     if [ -z "$selfhost_user" ]
     then
-        print_info "selfhost is not configured because selfhost_key is empty in $configfile"
+        print_info "freedns is not configured because freedns_key is empty in $configfile"
     else
         # Use cron for dynamich ip update
         #   - at reboot
-        #   - every 5 minutes
+        #   - every 30 minutes
         if [ -z "`grep 'selfhost-updater.sh' /etc/crontab`" ]
         then
             echo "@reboot root bash /etc/selfhost/selfhost-updater.sh update > /dev/null 2>&1" >> /etc/crontab
@@ -423,13 +471,89 @@ function install_letsencrypt {
     then
         die "Failed to install let's encrypt: 'le_domain' is empty in $configfile"
     fi
-    if [ -z "$le_email" ]
+    # configure apache
+    apache_le_conf=/etc/apache2/sites-available/le-default.conf    
+    if [ -f $apache_le_conf ]
     then
-        die "Failed to install let's encrypt: 'le_email' is empty in $configfile"
+        print_info "$apache_le_conf exist already"
+    else
+        cat > $apache_le_conf <<END
+# letsencrypt default Apache configuration
+Alias /.well-known/acme-challenge /var/www/letsencrypt
+
+<Directory /var/www/letsencrypt>
+    Options FollowSymLinks
+	Allow from all
+</Directory>
+END
+        a2ensite le-default.conf
+        service apache2 restart
     fi
-    nocheck_install "certbot python-certbot-apache" 
-    print_info "run certbot ..."
-	certbot --apache -w /var/www/html -d $le_domain -m $le_email --agree-tos --non-interactive --redirect --hsts --uir
+    # download the shell script
+    if [ -d $le_dir ]
+    then
+        print_info "letsenrypt exists already (nothing downloaded > no certificate created and registered)"
+        return 0
+    fi
+    git clone https://github.com/lukas2511/dehydrated $le_dir
+    cd $le_dir
+    # create config file for letsencrypt.sh
+    echo "WELLKNOWN=$le_dir" > $le_dir/config.sh
+    if [ -n "$le_email" ]
+    then
+        echo "CONTACT_EMAIL=$le_email" >> $le_dir/config.sh
+    fi
+    # create domain file for letsencrypt.sh
+    # WATCH THIS:
+    #    - It did not work wit "sub.domain.org www.sub.domain.org".
+    #    - So just use "sub.domain.org" only!
+    echo "$le_domain" > $le_dir/domains.txt
+    # test apache config for letsencrpyt
+    url_http=http://$le_domain/.well-known/acme-challenge/domains.txt
+    wget_output=$(wget -nv --spider --max-redirect 0 $url_http)
+    if [ $? -ne 0 ]
+    then
+        die "Failed to load $url_http"
+    fi
+    # accept terms of service of letsencrypt
+    ./dehydrated --register --accept-terms
+    # run script dehydrated
+    # 
+    ./dehydrated --cron --config $le_dir/config.sh
+}
+
+function configure_apache_for_https {
+    print_info "configuring apache to use httpS ..."
+    # letsencrypt.sh
+    #
+    #   "${BASEDIR}/certs/${domain}/privkey.pem"
+    #   "${BASEDIR}/certs/${domain}/cert.pem"
+    #   "${BASEDIR}/certs/${domain}/fullchain.pem"
+    #
+    SSLCertificateFile=${le_dir}/certs/${le_domain}/cert.pem
+    SSLCertificateKeyFile=${le_dir}/certs/${le_domain}/privkey.pem
+    SSLCertificateChainFile=${le_dir}/certs/${le_domain}/fullchain.pem
+    if [ ! -f $SSLCertificateFile ]
+    then
+        print_warn "Failed to configure apache for httpS: Missing certificate file $SSLCertificateFile" 
+        return 0  
+    fi
+    # make sure that the ssl mode is enabled
+    print_info "...configuring apache to use httpS - a2enmod ssl ..."
+    a2enmod ssl
+    # modify apach' ssl conf file 
+    if grep -i "ServerName" $sslconf
+    then
+        print_info "seems that apache was already configered to use httpS with $sslconf"
+    else
+        sed -i "s/ServerAdmin.*$/ServerAdmin webmaster@localhost\\n        ServerName ${le_domain}/" $sslconf 
+    fi     
+    sed -i s#/etc/ssl/certs/ssl-cert-snakeoil.pem#$SSLCertificateFile# $sslconf 
+    sed -i s#/etc/ssl/private/ssl-cert-snakeoil.key#$SSLCertificateKeyFile# $sslconf 
+    sed -i s#/etc/apache2/ssl.crt/server-ca.crt#$SSLCertificateChainFile# $sslconf 
+    sed -i s/#SSLCertificateChainFile/SSLCertificateChainFile/ $sslconf 
+    # apply changes
+    a2ensite default-ssl.conf
     service apache2 restart
 }
 
@@ -446,19 +570,9 @@ function check_https {
 }
 
 function install_hubzilla {
-    print_info "installing addons..."
+    print_info "installing hubzilla addons..."
     cd /var/www/html/
-    if git remote -v | grep -i "origin.*hubzilla.*core"
-    then
-        print_info "hubzilla"
-        util/add_addon_repo https://framagit.org/hubzilla/addons hzaddons
-    elif git remote -v | grep -i "origin.*zap.*core"
-    then
-        print_info "zap"
-        util/add_addon_repo https://framagit.org/zot/zap-addons.git zaddons
-    else
-        die "neither zap nor hubzilla repository > did not install addons or zap/hubzilla"
-    fi
+    util/add_addon_repo https://framagit.org/hubzilla/addons.git hzaddons
     mkdir -p "store/[data]/smarty3"
     chmod -R 777 store
     touch .htconfig.php
@@ -468,12 +582,58 @@ function install_hubzilla {
 	chown root:www-data /var/www/html/
 	chown root:www-data /var/www/html/.htaccess
 	chmod 0644 /var/www/html/.htaccess
-    print_info "installed addons"
+    # try to switch off email registration
+    sed -i "s/verify_email.*1/verify_email'] = 0/" /var/www/html/view/*/ht*
+    if [ -n "`grep -r 'verify_email.*1' /var/www/html/view/`" ]
+    then
+        print_warn "Hubzillas registration prozess might have email verification switched on."
+    fi
+    print_info "installed hubzilla"
 }
 
-function install_rsync {
-    print_info "installing rsync..."
-    nocheck_install "rsync"
+function rewrite_to_https {
+    print_info "configuring apache to redirect http to httpS ..."
+    htaccessfile=/var/www/html/.htaccess
+    if grep -i "https" $htaccessfile
+    then
+        print_info "...configuring apache to redirect http to httpS was already done in $htaccessfile"
+    else
+        sed -i "s#QSA]#QSA]\\n  RewriteCond %{SERVER_PORT} !^443$\\n  RewriteRule (.*) https://%{HTTP_HOST}/$1 [R=301,L]#" $htaccessfile 
+    fi     
+    service apache2 restart
+}
+
+# This will allways overwrite both config files
+#   - internal disk
+#   - external disk (LUKS + ext4)
+#  of rsnapshot for hubzilla
+function install_rsnapshot {
+    print_info "installing rsnapshot..."
+    nocheck_install "rsnapshot"
+    # internal disk
+    cp -f /etc/rsnapshot.conf $snapshotconfig
+    sed -i "s/^cmd_cp/#cmd_cp/" $snapshotconfig
+    sed -i "s/^backup/#backup/" $snapshotconfig
+	echo "backup	/var/lib/mysql/	localhost/" >> $snapshotconfig
+	echo "backup	/var/www/html/	localhost/" >> $snapshotconfig
+	echo "backup	/var/www/letsencrypt/	localhost/" >> $snapshotconfig
+	# external disk
+	if [ -n "$backup_device_name" ]
+	then
+		cp -f /etc/rsnapshot.conf $snapshotconfig_external_device   
+		sed -i "s#snapshot_root.*#snapshot_root	$backup_mount_point#" $snapshotconfig_external_device
+		sed -i "/alpha/s/6/30/" $snapshotconfig_external_device 
+		sed -i "s/^cmd_cp/#cmd_cp/" $snapshotconfig_external_device
+		sed -i "s/^backup/#backup/" $snapshotconfig_external_device
+		if [ -z "`grep 'letsencrypt' $snapshotconfig_external_device`" ]
+		then
+			echo "backup	/var/lib/mysql/	localhost/" >> $snapshotconfig_external_device
+			echo "backup	/var/www/html/	localhost/" >> $snapshotconfig_external_device
+			echo "backup	/var/www/letsencrypt/	localhost/" >> $snapshotconfig_external_device
+		fi
+    else
+        print_info "No backup configuration (rsnapshot) for external device configured. Reason: backup_device_name and/or backup_device_pass not given in $configfile"
+	fi
 }
 
 function install_cryptosetup {
@@ -484,28 +644,28 @@ function install_cryptosetup {
 function configure_cron_daily {
     print_info "configuring cron..."
     # every 10 min for poller.php
-    if [ -z "`grep 'Master.php' /etc/crontab`" ]
+    if [ -z "`grep 'poller.php' /etc/crontab`" ]
     then
         echo "*/10 * * * * www-data cd /var/www/html; php Zotlabs/Daemon/Master.php Cron >> /dev/null 2>&1" >> /etc/crontab
     fi
     # Run external script daily at 05:30
     # - stop apache and mysql-server
-    # - renew the certificate of letsencrypt
-    # - backup db, files (/var/www/html), certificates if letsencrypt
+    # - backup hubzilla
     # - update hubzilla core and addon
     # - update and upgrade linux
-    # - reboot is done by "shutdown -h now" because "reboot" hangs sometimes depending on the system
+    # - reboot
 echo "#!/bin/sh" > /var/www/$hubzilladaily
 echo "#" >> /var/www/$hubzilladaily
 echo "echo \" \"" >> /var/www/$hubzilladaily
 echo "echo \"+++ \$(date) +++\"" >> /var/www/$hubzilladaily
 echo "echo \" \"" >> /var/www/$hubzilladaily
 echo "echo \"\$(date) - renew certificate...\"" >> /var/www/$hubzilladaily
-echo "certbot renew --noninteractive" >> /var/www/$hubzilladaily
+echo "bash $le_dir/dehydrated --cron --config $le_dir/config.sh" >> /var/www/$hubzilladaily
 echo "#" >> /var/www/$hubzilladaily
-echo "echo \"\$(date) - stopping apache and mysql...\"" >> /var/www/$hubzilladaily
+echo "# stop hubzilla" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - stoping apache and mysql...\"" >> /var/www/$hubzilladaily
 echo "service apache2 stop" >> /var/www/$hubzilladaily
-echo "/etc/init.d/mysql stop # to avoid inconsistencies" >> /var/www/$hubzilladaily
+echo "/etc/init.d/mysql stop # to avoid inconsistancies" >> /var/www/$hubzilladaily
 echo "#" >> /var/www/$hubzilladaily
 echo "# backup" >> /var/www/$hubzilladaily
 echo "echo \"\$(date) - try to mount external device for backup...\"" >> /var/www/$hubzilladaily
@@ -536,13 +696,11 @@ echo "        if mount $backup_device_name $backup_mount_point" >> /var/www/$hub
 echo "        then" >> /var/www/$hubzilladaily
 echo "            device_mounted=1" >> /var/www/$hubzilladaily
 echo "            echo \"device $backup_device_name is now mounted. Starting backup...\"" >> /var/www/$hubzilladaily
-echo "            rsync -a --delete /var/lib/mysql/ /media/hubzilla_backup/mysql" >> /var/www/$hubzilladaily
-echo "            rsync -a --delete /var/www/ /media/hubzilla_backup/www" >> /var/www/$hubzilladaily
-echo "            rsync -a --delete /etc/letsencrypt/ /media/hubzilla_backup/letsencrypt" >> /var/www/$hubzilladaily
-echo "            echo \"\$(date) - disk sizes...\"" >> /var/www/$hubzilladaily
-echo "            df -h" >> /var/www/$hubzilladaily
-echo "            echo \"\$(date) - db size...\"" >> /var/www/$hubzilladaily
-echo "            du -h $backup_mount_point | grep mysql/hubzilla" >> /var/www/$hubzilladaily
+echo "			rsnapshot -c $snapshotconfig_external_device alpha" >> /var/www/$hubzilladaily
+echo "			echo \"\$(date) - disk sizes...\"" >> /var/www/$hubzilladaily
+echo "			df -h" >> /var/www/$hubzilladaily
+echo "			echo \"\$(date) - db size...\"" >> /var/www/$hubzilladaily
+echo "			du -h $backup_mount_point | grep mysql/hubzilla" >> /var/www/$hubzilladaily
 echo "            echo \"unmounting backup device...\"" >> /var/www/$hubzilladaily
 echo "            umount $backup_mount_point" >> /var/www/$hubzilladaily
 echo "        else" >> /var/www/$hubzilladaily
@@ -564,16 +722,18 @@ echo "echo \"\$(date) - db size...\"" >> /var/www/$hubzilladaily
 echo "du -h /var/lib/mysql/ | grep mysql/hubzilla" >> /var/www/$hubzilladaily
 echo "#" >> /var/www/$hubzilladaily
 echo "# update" >> /var/www/$hubzilladaily
-echo "echo \"\$(date) - updating core and addons...\"" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - updating dehydrated...\"" >> /var/www/$hubzilladaily
+echo "git -C /var/www/letsencrypt/ pull" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - updating hubhilla core...\"" >> /var/www/$hubzilladaily
 echo "(cd /var/www/html/ ; util/udall)" >> /var/www/$hubzilladaily
 echo "chown -R www-data:www-data /var/www/html/ # make all accessable for the webserver" >> /var/www/$hubzilladaily
 echo "chown root:www-data /var/www/html/.htaccess" >> /var/www/$hubzilladaily
 echo "chmod 0644 /var/www/html/.htaccess # www-data can read but not write it" >> /var/www/$hubzilladaily
 echo "echo \"\$(date) - updating linux...\"" >> /var/www/$hubzilladaily
 echo "apt-get -q -y update && apt-get -q -y dist-upgrade && apt-get -q -y autoremove # update linux and upgrade" >> /var/www/$hubzilladaily
-echo "echo \"\$(date) - Backup and update finished. Rebooting...\"" >> /var/www/$hubzilladaily
+echo "echo \"\$(date) - Backup hubzilla and update linux finished. Rebooting...\"" >> /var/www/$hubzilladaily
 echo "#" >> /var/www/$hubzilladaily
-echo "shutdown -r now" >> /var/www/$hubzilladaily
+echo "reboot" >> /var/www/$hubzilladaily
 
     if [ -z "`grep 'hubzilla-daily.sh' /etc/crontab`" ]
     then
@@ -585,6 +745,38 @@ echo "shutdown -r now" >> /var/www/$hubzilladaily
     print_info "configured cron for updates/upgrades"
 }
 
+function write_uninstall_script {
+    print_info "writing uninstall script..."
+
+    cat > /var/www/hubzilla-remove.sh <<END
+#!/bin/sh
+#
+# This script removes Hubzilla.
+# You might do this for a fresh start using the script.
+# The script will remove (almost everything) what was installed by the script,
+# all applications including hubzilla and its database.
+#
+# Backup the certificates of letsencrypt (you never know)
+cp -a /var/www/letsencrypt/ ~/backup_le_certificats
+#
+# Removal
+apt-get remove apache2 apache2-utils libapache2-mod-php5 php5 php-pear php5-xcache php5-curl php5-mcrypt php5-gd php5-mysql mysql-server mysql-client phpmyadmin
+apt-get purge apache2 apache2-utils libapache2-mod-php5 php5 php-pear php5-xcache php5-curl php5-mcrypt php5-gd php5-mysql mysql-server mysql-client phpmyadmin
+apt-get autoremove
+apt-get clean
+rm /etc/rsnapshot_hubzilla.conf
+rm /etc/rsnapshot_hubzilla_external_device.conf
+rm -R /etc/apache2/
+rm -R /var/lib/mysql/
+rm -R /var/www
+rm -R /etc/selfhost/
+# uncomment the next line if you want to remove the backups
+# rm -R /var/cache/rsnapshot
+nano /etc/crontab # remove entries there manually
+END
+    chmod -x /var/www/hubzilla-remove.sh
+}
+
 ########################################################################
 # START OF PROGRAM 
 ########################################################################
@@ -599,7 +791,12 @@ source $configfile
 selfhostdir=/etc/selfhost
 selfhostscript=selfhost-updater.sh
 hubzilladaily=hubzilla-daily.sh
+plugins_update=.homeinstall/plugins_update.sh
+snapshotconfig=/etc/rsnapshot_hubzilla.conf
+snapshotconfig_external_device=/etc/rsnapshot_hubzilla_external_device.conf
 backup_mount_point=/media/hubzilla_backup
+le_dir=/var/www/letsencrypt
+sslconf=/etc/apache2/sites-available/default-ssl.conf
 
 #set -x    # activate debugging from here
 
@@ -607,13 +804,12 @@ check_config
 stop_hubzilla
 update_upgrade
 install_curl
-install_wget
 install_sendmail
 install_apache
 install_imagemagick
 install_php
 install_mysql
-install_adminer
+install_phpmyadmin
 create_hubzilla_db
 run_freedns
 install_run_selfhost
@@ -623,34 +819,32 @@ configure_cron_selfhost
 
 if [ "$le_domain" != "localhost" ]
 then
-    install_letsencrypt
-    configure_apache_for_https
-    check_https
+	install_letsencrypt
+	configure_apache_for_https
+	check_https
 else
-    print_info "is localhost - skipped installation of letsencrypt and configuration of apache for https"
+	print_info "is localhost - skipped installation of letsencrypt and configuration of apache for https"
 fi     
 
 install_hubzilla
 
 if [ "$le_domain" != "localhost" ]
 then
-    rewrite_to_https
-    install_rsnapshot
+	rewrite_to_https
+	install_rsnapshot
 else
-    print_info "is localhost - skipped rewrite to https and installation of rsnapshot"
+	print_info "is localhost - skipped rewrite to https and installation of rsnapshot"
 fi     
 
 configure_cron_daily
 
 if [ "$le_domain" != "localhost" ]
 then
-    install_cryptosetup
-    write_uninstall_script
+	install_cryptosetup
+	write_uninstall_script
 else
-    print_info "is localhost - skipped installation of cryptosetup"
+	print_info "is localhost - skipped installation of cryptosetup"
 fi     
 
-
 #set +x    # stop debugging from here
 
-

CHANGELOG

@@ -1,218 +1,3 @@
-Hubzilla 4.6 (2019-12-04)
-	- Improve opengraph support for channels
-	- Add opengraph support for articles
-	- Update abook_connected for RSS feeds only if handle_feed() returned success
-	- Do not embed PDF files by default but allow to enabled this feature in security options
-	- Check if file exists before we include it in the router
-	- Update jquery to version 3.4.1
-	- Update composer libraries
-	- Remove old and unused javascript libraries
-	- Improved BBcode to Markdown conversion
-	- Introduce inline SVG support via BBcode
-	- Sanitize title on Atom/RSS feed import
-	- Improved HTTP headers cache support for photos
-	- Add date headers to signed headers
-	- Add check if item['tag'] is an array
-	- Add hook comments_are_now_closed for addons to override date based comment closure
-	- Change mysql schema for item.llink and item.plink for new installs from char(191) to text
-	- Improved photo cache expiration
-	- Improved plural function processing on translation strings creation from .po file with util/po2php utlility
-	- Improved support for CDN/Infrastructure caching (especially profile images)
-	- New japanese translation
-	- Add connect button for non-zot networks not connected in current location
-	- Allow to send forum channels wall2wall or sent by mentions post to external sites via addons
-	- Allow addons to process forum posts published through mentions
-	- Improved internal routing for ActivityPub messages
-	- Improved admin documentation
-	- Add ITEM_TYPE_CUSTOM and hooks to permit addons to create and distribute custom item types
-	- Support "comment policy" in Zot6 communications
-	- Add selected text as quote on reply if comment button is used
-	- Add more nofollow tags to links to discourage backlink farmers
-	- Improved conversion of emoji reactions from zot to zot6
-	- Add CardDAV/CalDAV autodiscovery
-	- Label source project of zotfeed since it is not completely compatible across projects
-	- Update homeinstall script
-
-	Bugfixes
-	- Fix once cached embedded content is used and stored forever
-	- Fix wildcard tag issue
-	- Fix duplicate attachment in jot fileupload
-	- Fix regression with audio file upload
-	- Fix can not edit menu name or title (#1402)
-	- Fix pagination encoding issue for some server setups
-	- Fix Zap->Hubzilla event title compatibility
-	- Fix event timezones for Zot6
-	- Fix missing summary in mod article_edit
-	- Fix PHP warning failed to write session data using user defined save handler
-	- Fix possible thumbnails distortion on rebuild with util/thumbrepair utility
-	- Fix issues with image import to zot6
-	- Fix attachment permissions on clonned channels sync
-	- Fix entries without sitekey returned from DB in queue_deliver() and Lib/Queue
-
-	Addons
-	- Twitter: send tweet even if attached image uploading was unsuccessful
-	- Livejournal: add link to original post option
-	- Flashcards: update to version 2.08
-	- Pubcrawl: compatibility changes to support pixelfed
-	- Cart: update paypal button to API v2
-	- Photocache: rework for speed and lower memory consumption
-	- Photocache: etag support for cached photos
-	- Photocache: purge cache on addon uninstall
-	- Openstreetmap: fix regression if no default values set
-	- Livejournal: allow send posts from non channel owner
-	- Pubcrawl: fix event timezones
-	- Pubcrawl: better ActivityPub channel URL detection
-	- Pubcrawl: fix comments delivery for other channels on the same hub
-	- New addon "workflow" with initial basic "issue tracker" capability
-
-
-Hubzilla 4.4.1 (2019-08-16)
-	- Fix wrong profile photo displayed when previewing and editing profiles
-	- Fix regression from 4.4 which prevented encrypted signatures from being used for encrypted messages
-	- Fix typo in queueworker addon which broke filtering of duplicate work
-
-
-Hubzilla 4.4 (2019-08-13)
-	- Change primary directory from zotadel.net to hub.netzgemeinde.eu (requested by zotadel admin)
-	- Add Russian context help files
-	- Replace plink URL with share tag if possible
-	- Catch and exclude trailing punctuation while URL embedding
-	- Do not limit channel if service class property value is set to zero
-	- Streamline keyId and creator/actor
-	- Add daemon_master_summon hook
-	- Serve static files directly if not caught by web server
-	- Update cacert.pem
-	- Calendar: allow different date/time format inputs
-	- Calendar: hide timezone select for allday events
-	⁻ Add opengraph meta info to channel page
-	- Begin directory migration to zot6
-	- Support zot and zot6 in social graph operations
-	- Lowlevel support for zot6 direct messages
-	- Consolidate HTTP signatures
-	- Allow api login by address or url
-	- Provide auto redirect from zot6 /item permalinks
-	- Export all items except photos in channel_export_items_date()
-	- Calendar: clicking a day or week number will now open the day or week view
-	- Remove cached photo location directory on delete if empty
-	- Include zot6 hubs in the Grid scope
-	- Fix os_path replace for thumbnails
-	- Avoid to process original images using storeThumbnail()
-
-	Bugfixes
-	- Fix URLs on imported item taxonomy
-	- Fix admin not allowed to delete any item
-	- Fix webfiunger issue with URLs containing an @
-	- Fix missing object in emoji reactions
-	- Fix appschema to include diaspora:guid
-	- Fix zotfinger in update_directory_entry()
-	- Fix incorrect media type on links for photo objects
-	- Fix mid not dbesc'd in item_store()
-	- Fix calendar encoding issues
-
-	Addons
-	- twitter: various rendering improvements
-	- cavatar: fix wrong image mimetype
-	- gravatar: fix wrong image mimetype
-	- Add license file
-	- pubcrawl: make repeats render like wall to wall posts
-	- pubcrawl: fix pubcrawl_import_author() sometimes returning a non activitypub xchan
-	- pubcrawl: use Lib/Activity for taxonomy en/decoding
-	- pubcrawl: fix wrong uuid in like activity
-	- pubcrawl: fix issue with encoding hashtags
-	- openstreetmap: use https URLs by default
-	- queueworker: refactor and efficiency improvements
-	- pubcrawl: use unique IDs for follow and accept activities
-	- pubcrawl: implement thread completion
-	- pubcrawl: implement delete activity
-	- photocache: reduce the size of the photo cache subdirectories tree
-	- photocache: use html_entity_decode() for cached photo URL
-	- diaspora: fix possible issue with diaspora relay not initializing
-
-
-Hubzilla 4.2.1 (2019-06-17)
-	- Deprecate mod events
-	- Revisit mod cal
-	- Fix issues with deletion of linked items and resources
-	- Fix zot6 delete issue
-	- Fix attach sync issue
-	- Remove sizeRangeSuffixes in justified gallery wrapper
-	- Fix storageconv issue with postgres
-	- Fix embedphotos image size
-	- pubcrawl: use URI instead of object for actor url
-	- diaspora: adjust loglevel
-	- gallery: remove workaround for margin issue which has been fixed upstream
-	- cart: warn about unsaved changes
-
-
-Hubzilla 4.2 (2019-06-04)
-	- Introduce Calendar app which deprecates Events and CalDAV apps and streamlines the featuresets
-	- Update mod cal to reflect changes in the calendar app
-	- Improve timezone detection for CalDAV calendars
-	- Add mention support to event description in channel calendar
-	- Update jgrowl library
-	- Do not try to oembed URLs without embed tags
-	- Optimise pdf oembed processing
-	- Add form security token to mod register
-	- Replace URLs for mod gallery, mod photos and mod photo on cloned channel post sync
-	- Update justified gallery library
-	- Update bootstrap libraries
-	- Use "cache" flag for bbcode() on content destined for zot6
-	- Improve DB indexing
-	- Drop deprecated columns from channel the table
-	- Replace own image URL in clonned channel posts
-	- Improve DB update handling
-	- Improve item deletion when a contact was removed
-	- Zot6 compatibility for emoji reactions
-	- Add threaded comments support (disabled by default)
-	- Improve xmlify()/unxmlify() performance
-	- Update blueimp/jquery-file-uplad library
-	- Update sabre/vobject library
-	- Various doco updates
-	- Implement remove profile photo button (reset to default photo)
-	- Implement remove cover photo button
-	- Update the homeinstall script
-	- Add command line tool for photo thumbnails storage conversion
-	- Implement option to store photo thumbnails in filesystem instead of DB
-
-	Bugfixes
-	- Fix category widget when using articles
-	- Fix live update not triggering in mod search
-	- Fix encoded URLs in code blocks
-	- Fix wiki headers not escaped
-	- Fix possible xchan protocol confusion in new_contact()
-	- Fix xchan_url not displayed if xchan_addr not available
-	- Fix suggestion ordering in mod directory
-	- Fix event attachment delivery to zot6
-
-	Addons
-	- pubcrawl: improve friendica compatibility by adding the nonstandard diaspora:guid field
-	- pubcrawl: initial suport for events
-	- pubcrawl: improve permalink detection
-	- flashcards: fix moving learn buttons if viewport sizes changes
-	- flashcards: Move card details to the bottom of a card
-	- upgrade_info: provide links to changelog
-	- photocache: do not save filename for cached photos
-	- pubcrawl: save local comment activitypub payload in iconfig to be used for relay
-	- flashcards: UI improvements in box settings
-	- pubcrawl: implement profile update messages
-	- pubcrawl: use URI instead of object for actor
-	- flashcards: fix jumping sync button
-	- pubcrawl: add threaded comments support
-	- pubcrawl: ignore target encoding errors
-	- pubcrawl: format photo items for activitypub
-
-
-Hubzilla 4.0.3 (2019-04-26)
-	- Add attachments to zot6 event objects
-	- Add zot6 to federated transports 
-	- Update import/export to handle zot6 hublocs and xchans
-	- Update fix_system_urls() to handle zot6 hublocs
-	- Fix infinite loop using postgres as backend
-	- Fix magic auth in combination with zot6
-	- Fix check for required PHP version
-	- Diaspora: favour diaspora protocol identities over others with same hubloc or xchan address
-
-
 Hubzilla 4.0.2 (2019-04-08)
 	- Port cdav calendar to fullcalendar version 4
 	- Fix perms_pending not evaluated correctly

LICENSE

@@ -1,5 +1,4 @@
-Copyright (c) 2019 Hubzilla Community
-
+Copyright (c) 2010-2018 the Hubzilla Community
 All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -9,13 +8,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

Zotlabs/Daemon/Cron.php

@@ -40,15 +40,6 @@ class Cron {
 
 		require_once('include/sharedwithme.php');
 		apply_updates();
-
-		/**
-		 * Chatpresence: if somebody hasn't pinged recently, they've most likely left the page
-		 * and shouldn't count as online anymore. We allow an expection for bots.
-		 */
-		q("delete from chatpresence where cp_last < %s - INTERVAL %s and cp_client != 'auto' ",
-			db_utcnow(),
-			db_quoteinterval('3 MINUTE')
-		);
 	
 		// expire any expired mail
 
@@ -106,26 +97,26 @@ class Cron {
 		
 		// Clean expired photos from cache
 		
+		$age = get_config('system','active_expire_days', '30');
 		$r = q("SELECT DISTINCT xchan, content FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s",
 			intval(PHOTO_CACHE),
-			db_utcnow(),
-			db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY')
+			db_utcnow(), 
+			db_quoteinterval($age . ' DAY')
 		);
 		if($r) {
-			q("DELETE FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s",
-				intval(PHOTO_CACHE),
-				db_utcnow(),
-				db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY')
-			);
 			foreach($r as $rr) {
 				$file = dbunescbin($rr['content']);
 				if(is_file($file)) {
 					@unlink($file);
-					@rmdir(dirname($file));
 					logger('info: deleted cached photo file ' . $file, LOGGER_DEBUG);
 				}
 			}
 		}
+		q("DELETE FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s",
+			intval(PHOTO_CACHE),
+			db_utcnow(), 
+			db_quoteinterval($age . ' DAY')
+		);		
 
 		// publish any applicable items that were set to be published in the future
 		// (time travel posts). Restrict to items that have come of age in the last
@@ -196,7 +187,7 @@ class Cron {
 		if($r) {
 			require_once('include/photo/photo_driver.php');
 			foreach($r as $rr) {
-				$photos = import_xchan_photo($rr['xchan_photo_l'], $rr['xchan_hash'], false, true);
+				$photos = import_xchan_photo($rr['xchan_photo_l'],$rr['xchan_hash']);
 				$x = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
 					where xchan_hash = '%s'",
 					dbesc($photos[0]),
@@ -223,7 +214,7 @@ class Cron {
 			$restart = true;
 			$generation = intval($argv[2]);
 			if(! $generation)
-				return;
+				killme();		
 		}
 
 		reload_plugins();

Zotlabs/Daemon/Cron_daily.php

@@ -44,17 +44,6 @@ class Cron_daily {
 			db_utcnow(), db_quoteinterval('1 YEAR')
 		);
 
-		// expire anonymous sse notification entries once a day
-
-		q("delete from xconfig where xchan like '%s'",
-			dbesc('sse_id.%')
-		);
-
-		// Clean up emdedded content cache
-		q("DELETE FROM cache WHERE updated < %s - INTERVAL %s",
-		    db_utcnow(),
-		    db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY')
-		);
 
 		//update statistics in config
 		require_once('include/statistics_fns.php');

Zotlabs/Daemon/CurlAuth.php

@@ -13,7 +13,7 @@ class CurlAuth {
 	static public function run($argc,$argv) {
 
 		if($argc != 2)
-			return;
+			killme();
 
 		\App::$session->start();
 
@@ -50,6 +50,6 @@ class CurlAuth {
 
 		file_put_contents($c,$x);
 
-		return;
+		killme();
 	}
-}
+}

Zotlabs/Daemon/Master.php

@@ -9,7 +9,7 @@ if(array_search( __file__ , get_included_files()) === 0) {
 
 	if($argc)
 		Master::Release($argc,$argv);
-	return;
+	killme();
 }
 
 
@@ -17,22 +17,7 @@ if(array_search( __file__ , get_included_files()) === 0) {
 class Master {
 
 	static public function Summon($arr) {
-		$hookinfo = [
-			'argv'=>$arr
-		];
-
-		call_hooks ('daemon_master_summon',$hookinfo);
-
-		$arr = $hookinfo['argv'];
-		$argc = count($arr);
-
-		if ((!is_array($arr) || (count($arr) < 1))) {
-			logger("Summon handled by hook.",LOGGER_DEBUG);
-			return;
-		}
-
-		$phpbin = get_config('system','phpbin','php');
-		proc_run($phpbin,'Zotlabs/Daemon/Master.php',$arr);
+		proc_run('php','Zotlabs/Daemon/Master.php',$arr);
 	}
 
 	static public function Release($argc,$argv) {
@@ -48,7 +33,6 @@ class Master {
 		$argc = count($argv);
 
 		if ((!is_array($argv) || (count($argv) < 1))) {
-			logger("Release handled by hook.",LOGGER_DEBUG);
 			return;
 		}
 

Zotlabs/Daemon/Notifier.php

@@ -3,7 +3,6 @@
 namespace Zotlabs\Daemon;
 
 use Zotlabs\Lib\Libzot;
-use Zotlabs\Lib\Activity;
 
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
@@ -286,21 +285,8 @@ class Notifier {
 			}
 
 			if(! in_array(intval($target_item['item_type']), [ ITEM_TYPE_POST ] )) {
-				$hookinfo=[
-					'targetitem'=>$target_item,
-					'deliver'=>false
-				];
-				if (intval($target_item['item_type'] == ITEM_TYPE_CUSTOM)) {
-					call_hooks('customitem_deliver',$hookinfo);
-				}
-
-				if (!$hookinfo['deliver']) {
-					logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG);
-					return;
-				}
-
-				$target_item = $hookinfo['targetitem'];
-
+				logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG);
+				return;
 			}
 
 			// Check for non published items, but allow an exclusion for transmitting hidden file activities
@@ -367,18 +353,9 @@ class Notifier {
 				$activity = json_decode($m,true);
 			}
 			else {
-				$activity = array_merge(['@context' => [
-                    ACTIVITYSTREAMS_JSONLD_REV,
-                    'https://w3id.org/security/v1',
-                    z_root() . ZOT_APSCHEMA_REV
-                    ]], Activity::encode_activity($target_item)
-				);
+				$activity = \Zotlabs\Lib\Activity::encode_activity($target_item);
 			}		
 
-			logger('target_item: ' . print_r($target_item,true), LOGGER_DEBUG);
-			logger('encoded: ' . print_r($activity,true), LOGGER_DEBUG);
-
-
 			// Send comments to the owner to re-deliver to everybody in the conversation
 			// We only do this if the item in question originated on this site. This prevents looping.
 			// To clarify, a site accepting a new comment is responsible for sending it to the owner for relay.

Zotlabs/Daemon/Onepoll.php

@@ -61,13 +61,11 @@ class Onepoll {
 
 		if($contact['xchan_network'] === 'rss') {
 			logger('onepoll: processing feed ' . $contact['xchan_name'], LOGGER_DEBUG);
-			$alive = handle_feed($importer['channel_id'],$contact_id,$contact['xchan_hash']);
-			if ($alive) {
-				q("update abook set abook_connected = '%s' where abook_id = %d",
-					dbesc(datetime_convert()),
-					intval($contact['abook_id'])
-				);
-			}
+			handle_feed($importer['channel_id'],$contact_id,$contact['xchan_hash']);
+			q("update abook set abook_connected = '%s' where abook_id = %d",
+				dbesc(datetime_convert()),
+				intval($contact['abook_id'])
+			);
 			return;
 		}
 	

Zotlabs/Daemon/Poller.php

@@ -47,7 +47,7 @@ class Poller {
 			$restart = true;
 			$generation = intval($argv[2]);
 			if(! $generation)
-				return;
+				killme();		
 		}
 
 		if(($argc > 1) && intval($argv[1])) {

Zotlabs/Lib/ActivityStreams.php

@@ -101,13 +101,7 @@ class ActivityStreams {
 					$this->actor = $this->get_actor('attributedTo',$this->obj);
 				}
 			}
-
-			// fetch recursive or embedded activities
 			
-			if ($this->obj && is_array($this->obj) && array_key_exists('object',$this->obj)) {
-				$this->obj['object'] = $this->get_compound_property($this->obj['object']);
-			}
-
 			if($this->obj && is_array($this->obj) && $this->obj['actor'])
 				$this->obj['actor'] = $this->get_actor('actor',$this->obj);
 			if($this->tgt && is_array($this->tgt) && $this->tgt['actor'])

Zotlabs/Lib/Apps.php

@@ -70,10 +70,11 @@ class Apps {
 			'Channel Home',
 			'View Profile',
 			'Photos',
-			'Calendar',
+			'Events',
 			'Directory',
 			'Search',
 			'Help',
+			'Mail',
 			'Profile Photo'
 		]);
 
@@ -341,7 +342,7 @@ class Apps {
 			'Channel Home' => t('Channel Home'),
 			'View Profile' => t('View Profile'),
 			'Photos' => t('Photos'),
-			'Calendar' => t('Calendar'),
+			'Events' => t('Events'),
 			'Directory' => t('Directory'),
 			'Help' => t('Help'),
 			'Mail' => t('Mail'),
@@ -362,6 +363,7 @@ class Apps {
 			'Privacy Groups' => t('Privacy Groups'),
 			'Notifications' => t('Notifications'),
 			'Order Apps' => t('Order Apps'),
+			'CalDAV' => t('CalDAV'),
 			'CardDAV' => t('CardDAV'),
 			'Channel Sources' => t('Channel Sources'),
 			'Guest Access' => t('Guest Access'),

Zotlabs/Lib/Cache.php

@@ -7,23 +7,12 @@ namespace Zotlabs\Lib;
 	 */
 	 
 class Cache {
-    
-    /**
-     * @brief Returns cached content
-     * 
-     * @param string $key
-     * @param string $age in SQL format, default is '30 DAY'
-     * @return string
-     */
-    
-	public static function get($key, $age = '') {
+	public static function get($key) {
 
 		$hash = hash('whirlpool',$key);
 
-		$r = q("SELECT v FROM cache WHERE k = '%s' AND updated > %s - INTERVAL %s LIMIT 1",
-			dbesc($hash),
-			db_utcnow(),
-			db_quoteinterval(($age ? $age : get_config('system','object_cache_days', '30') . ' DAY'))
+		$r = q("SELECT v FROM cache WHERE k = '%s' limit 1",
+			dbesc($hash)
 		);
 			
 		if ($r)
@@ -51,4 +40,12 @@ class Cache {
 				dbesc(datetime_convert()));
 		}
 	}
+
+		
+	public static function clear() {
+		q("DELETE FROM cache WHERE updated < '%s'",
+			dbesc(datetime_convert('UTC','UTC',"now - 30 days")));			
+	}
+		
 }
+	 

Zotlabs/Lib/DB_Upgrade.php

@@ -58,15 +58,10 @@ class DB_Upgrade {
 					
 
 					$c =  new $cls();
-
 					$retval = $c->run();
 
 					if($retval != UPDATE_SUCCESS) {
 
-
-						$source = t('Source code of failed update: ') . "\n\n" . @file_get_contents('Zotlabs/Update/' . $s . '.php');
-												
-
 						// Prevent sending hundreds of thousands of emails by creating
 						// a lockfile.  
 
@@ -91,9 +86,7 @@ class DB_Upgrade {
 										'$sitename' => \App::$config['system']['sitename'],
 										'$siteurl' =>  z_root(),
 										'$update' => $x,
-										'$error' => sprintf( t('Update %s failed. See error logs.'), $x),
-										'$baseurl' => z_root(),
-										'$source' => $source
+										'$error' => sprintf( t('Update %s failed. See error logs.'), $x)
 									]
 								)
 							]

Zotlabs/Lib/Enotify.php

@@ -550,11 +550,6 @@ class Enotify {
 	if ((\App::$language === 'en' || (! \App::$language)) && strpos($msg,', '))
 		$msg = substr($msg,strpos($msg,', ')+1);	
 
-	$datarray['id'] = $notify_id;
-	$datarray['msg'] = $msg;
-
-	call_hooks('enotify_store_end', $datarray);
-
 	$r = q("update notify set msg = '%s' where id = %d and uid = %d",
 		dbesc($msg),
 		intval($notify_id),
@@ -810,14 +805,8 @@ class Enotify {
 		}
 		else {
 			$itemem_text = (($item['item_thread_top'])
-				? (($item['obj_type'] === 'Question') ? t('created a new poll') : t('created a new post'))
-				: (($item['obj_type'] === 'Answer') ? sprintf( t('voted on %s\'s poll'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]') : sprintf( t('commented on %s\'s post'), '[bdi]' . $item['owner']['xchan_name'] . '[/bdi]'))
-			);
-
-			if($item['verb'] === ACTIVITY_SHARE) {
-				$itemem_text = sprintf( t('repeated %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]');
-			}
-
+				? t('created a new post')
+				: sprintf( t('commented on %s\'s post'), $item['owner']['xchan_name']));
 		}
 
 		$edit = false;
@@ -836,24 +825,21 @@ class Enotify {
 
 		// convert this logic into a json array just like the system notifications
 
-		$who = (($item['verb'] === ACTIVITY_SHARE) ? 'owner' : 'author');
-
 		$x = array(
 			'notify_link' => $item['llink'],
-			'name' => $item[$who]['xchan_name'],
-			'addr' => (($item[$who]['xchan_addr']) ? $item[$who]['xchan_addr'] : $item[$who]['xchan_url']),
-			'url' => $item[$who]['xchan_url'],
-			'photo' => $item[$who]['xchan_photo_s'],
-			'when' => (($edit) ? datetime_convert('UTC', date_default_timezone_get(), $item['edited']) : datetime_convert('UTC', date_default_timezone_get(), $item['created'])),
+			'name' => $item['author']['xchan_name'],
+			'addr' => (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']),
+			'url' => $item['author']['xchan_url'],
+			'photo' => $item['author']['xchan_photo_s'],
+			'when' => relative_date(($edit)? $item['edited'] : $item['created']), 
 			'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'),
-			'b64mid' => 'b64.' . base64url_encode($item['mid']),
-			//'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])),
+			'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])),
 			'notify_id' => 'undefined',
 			'thread_top' => (($item['item_thread_top']) ? true : false),
-			'message' => bbcode(escape_tags($itemem_text)),
+			'message' => strip_tags(bbcode($itemem_text)),
 			// these are for the superblock addon
-			'hash' => $item[$who]['xchan_hash'],
-			'uid' => $item['uid'],
+			'hash' => $item['author']['xchan_hash'],
+			'uid' => local_channel(),
 			'display' => true
 		);
 
@@ -865,120 +851,4 @@ class Enotify {
 		return $x;
 	}
 
-	static public function format_notify($tt) {
-
-		$message = trim(strip_tags(bbcode($tt['msg'])));
-
-		if(strpos($message, $tt['xname']) === 0)
-			$message = substr($message, strlen($tt['xname']) + 1);
-
-		$mid = basename($tt['link']);
-
-		$b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : 'b64.' . base64url_encode($mid));
-
-		$x = [
-			'notify_link' => z_root() . '/notify/view/' . $tt['id'],
-			'name' => $tt['xname'],
-			'url' => $tt['url'],
-			'photo' => $tt['photo'],
-			'when' => datetime_convert('UTC', date_default_timezone_get(), $tt['created']),
-			'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'),
-			'b64mid' => (($tt['otype'] == 'item') ? $b64mid : 'undefined'),
-			'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : 'undefined'),
-			'message' => $message
-		];
-
-		return $x;
-
-	}
-
-	static public function format_intros($rr) {
-
-		$x = [
-			'notify_link' => z_root() . '/connections/ifpending',
-			'name' => $rr['xchan_name'],
-			'addr' => $rr['xchan_addr'],
-			'url' => $rr['xchan_url'],
-			'photo' => $rr['xchan_photo_s'],
-			'when' => datetime_convert('UTC', date_default_timezone_get(), $rr['abook_created']),
-			'hclass' => ('notify-unseen'),
-			'message' => t('added your channel')
-		];
-
-		return $x;
-
-	}
-
-	static public function format_files($rr) {
-
-		$x = [
-			'notify_link' => z_root() . '/sharedwithme',
-			'name' => $rr['author']['xchan_name'],
-			'addr' => $rr['author']['xchan_addr'],
-			'url' => $rr['author']['xchan_url'],
-			'photo' => $rr['author']['xchan_photo_s'],
-			'when' => datetime_convert('UTC', date_default_timezone_get(), $rr['created']),
-			'hclass' => ('notify-unseen'),
-			'message' => t('shared a file with you')
-		];
-
-		return $x;
-
-	}
-
-	static public function format_mail($rr) {
-
-		$x = [
-			'notify_link' => z_root() . '/mail/' . $rr['id'],
-			'name' => $rr['xchan_name'],
-			'addr' => $rr['xchan_addr'],
-			'url' => $rr['xchan_url'],
-			'photo' => $rr['xchan_photo_s'],
-			'when' => datetime_convert('UTC', date_default_timezone_get(), $rr['created']),
-			'hclass' => (intval($rr['mail_seen']) ? 'notify-seen' : 'notify-unseen'),
-			'message' => t('sent you a private message'),
-		];
-
-		return $x;
-
-	}
-
-	static public function format_all_events($rr) {
-
-		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
-		$strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart']);
-		$today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false);
-		$when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
-
-		$x = [
-			'notify_link' => z_root() . '/cdav/calendar/' . $rr['event_hash'],
-			'name'        => $rr['xchan_name'],
-			'addr'        => $rr['xchan_addr'],
-			'url'         => $rr['xchan_url'],
-			'photo'       => $rr['xchan_photo_s'],
-			'when'        => $when,
-			'hclass'       => ('notify-unseen'),
-			'message'     => t('posted an event')
-		];
-
-		return $x;
-
-	}
-
-	static public function format_register($rr) {
-
-		$x = [
-			'notify_link' => z_root() . '/admin/accounts',
-			'name' => $rr['account_email'],
-			'addr' => $rr['account_email'],
-			'url' => '',
-			'photo' => z_root() . '/' . get_default_profile_photo(48),
-			'when' => datetime_convert('UTC', date_default_timezone_get(),$rr['account_created']),
-			'hclass' => ('notify-unseen'),
-			'message' => t('requires approval')
-		];
-
-		return $x;
-
-	}
 }

Zotlabs/Lib/JSalmon.php

@@ -2,7 +2,7 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Web\HTTPSig;
+use Zotlabs\Zot6\HTTPSig;
 
 class JSalmon {
 

Zotlabs/Lib/LDSignatures.php

@@ -29,8 +29,8 @@ class LDSignatures {
 		$options = [
 			'type' => 'RsaSignature2017',
 			'nonce' => random_string(64),
-			'creator' => z_root() . '/channel/' . $channel['channel_address'],
-			'created' => datetime_convert('UTC','UTC', 'now', 'Y-m-d\TH:i:s\Z')
+			'creator' => z_root() . '/channel/' . $channel['channel_address'] . '/public_key_pem',
+			'created' => datetime_convert('UTC','UTC', 'now', 'Y-m-d\Th:i:s\Z')
 		];
 
 		$ohash = self::hash(self::signable_options($options));
@@ -124,7 +124,7 @@ class LDSignatures {
 			'meDataType'  => $data_type,
 			'meEncoding'  => $encoding,
 			'meAlgorithm' => $algorithm,
-			'meCreator'   => z_root() . '/channel/' . $channel['channel_address'],
+			'meCreator'   => z_root() . '/channel/' . $channel['channel_address'] . '/public_key_pem',
 			'meSignatureValue' => $signature
 		]);
 
@@ -132,4 +132,4 @@ class LDSignatures {
 
 
 
-}
+}

Zotlabs/Lib/Libsync.php

@@ -83,7 +83,7 @@ class Libsync {
 
 		$info = (($packet) ? $packet : array());
 		$info['type'] = 'sync';
-		$info['encoding'] = 'hz'; // note: not zot, this packet is very platform specific
+		$info['encoding'] = 'red'; // note: not zot, this packet is very platform specific
 		$info['relocate'] = ['channel_address' => $channel['channel_address'], 'url' => z_root() ];
 
 		if(array_key_exists($uid,\App::$config) && array_key_exists('transient',\App::$config[$uid])) {
@@ -144,7 +144,7 @@ class Libsync {
 
 		foreach($synchubs as $hub) {
 			$hash = random_string();
-			$n = Libzot::build_packet($channel,'sync',$env_recips,json_encode($info),'hz',$hub['hubloc_sitekey'],$hub['site_crypto']);
+			$n = Libzot::build_packet($channel,'sync',$env_recips,json_encode($info),'red',$hub['hubloc_sitekey'],$hub['site_crypto']);
 			Queue::insert(array(
 				'hash'       => $hash,
 				'account_id' => $channel['channel_account_id'],
@@ -244,13 +244,7 @@ class Libsync {
 
 			if(array_key_exists('app',$arr) && $arr['app'])
 				sync_apps($channel,$arr['app']);
-				
-			if(array_key_exists('addressbook',$arr) && $arr['addressbook'])
-				sync_addressbook($channel,$arr['addressbook']);
-
-			if(array_key_exists('calendar',$arr) && $arr['calendar'])
-				sync_calendar($channel,$arr['calendar']);
-
+	
 			if(array_key_exists('chatroom',$arr) && $arr['chatroom'])
 				sync_chatrooms($channel,$arr['chatroom']);
 

Zotlabs/Lib/Libzot.php

@@ -2,7 +2,7 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Web\HTTPSig;
+use Zotlabs\Zot6\HTTPSig;
 use Zotlabs\Access\Permissions;
 use Zotlabs\Access\PermissionLimits;
 use Zotlabs\Daemon\Master;
@@ -1220,42 +1220,12 @@ class Libzot {
 					$arr['owner_xchan'] = $env['sender'];
 				}
 
-				if ($private && (! intval($arr['item_private']))) {
-					$arr['item_private'] = 1;
+				if($private) {
+					$arr['item_private'] = true;
 				}
-
-				if ($arr['mid'] === $arr['parent_mid']) {
-					if (is_array($AS->obj) && array_key_exists('commentPolicy',$AS->obj)) {
-						$p = strstr($AS->obj['commentPolicy'],'until=');
-						if($p !== false) {
-							$arr['comments_closed'] = datetime_convert('UTC','UTC', substr($p,6));
-							$arr['comment_policy'] = trim(str_replace($p,'',$AS->obj['commentPolicy']));
-						}
-						else {
-							 $arr['comment_policy'] = $AS->obj['commentPolicy'];
-						}
-					}
-				}
-
-
 				/// @FIXME - spoofable
 				if($AS->data['hubloc']) {
 					$arr['item_verified'] = true;
-
-					if (! array_key_exists('comment_policy',$arr)) {
-						// set comment policy depending on source hub. Unknown or osada is ActivityPub.
-						// Anything else we'll say is zot - which could have a range of project names
-						$s = q("select site_project from site where site_url = '%s' limit 1",
-							dbesc($r[0]['hubloc_url'])
-						);
-
-						if ((! $s) || (in_array($s[0]['site_project'],[ '', 'osada' ]))) {
-							$arr['comment_policy'] = 'authenticated';
-						}
-						else {
-							$arr['comment_policy'] = 'contacts';
-						}
-					}
 				}
 				if($AS->data['signed_data']) {
 					IConfig::Set($arr,'activitystreams','signed_data',$AS->data['signed_data'],false);
@@ -1277,12 +1247,7 @@ class Libzot {
 				logger('Channel sync received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
 				logger('Channel sync recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
 
-				if ($env['encoding'] === 'hz') {
-					$result = Libsync::process_channel_sync_delivery($env['sender'],$arr,$deliveries);
-				}
-				else {
-					logger('sync packet type not supported.');
-				}
+				$result = Libsync::process_channel_sync_delivery($env['sender'],$arr,$deliveries);
 			}
 		}
 		if ($result) {
@@ -1613,11 +1578,10 @@ class Libzot {
 				// As a side effect we will also do a preliminary check that we have the top-level-post, otherwise
 				// processing it is pointless.
 
-				$r = q("select route, id, parent_mid, mid, owner_xchan, item_private, obj_type from item where mid = '%s' and uid = %d limit 1",
+				$r = q("select route, id, owner_xchan, item_private from item where mid = '%s' and uid = %d limit 1",
 					dbesc($arr['parent_mid']),
 					intval($channel['channel_id'])
 				);
-
 				if(! $r) {
 					$DR->update('comment parent not found');
 					$result[] = $DR->get();
@@ -1640,16 +1604,6 @@ class Libzot {
 					continue;
 				}
 
-				if ($r[0]['obj_type'] === 'Question') {
-					// route checking doesn't work correctly here because we've changed the privacy
-					$r[0]['route'] = EMPTY_STR;
-					// If this is a poll response, convert the obj_type to our (internal-only) "Answer" type
-					if ($arr['obj_type'] === ACTIVITY_OBJ_COMMENT && $arr['title'] && (! $arr['body'])) {
-						$arr['obj_type'] = 'Answer';
-					}
-				}
-
-
 				if($relay || $friendofriend || (intval($r[0]['item_private']) === 0 && intval($arr['item_private']) === 0)) {
 					// reset the route in case it travelled a great distance upstream
 					// use our parent's route so when we go back downstream we'll match
@@ -1780,7 +1734,7 @@ class Libzot {
 				// if it's a sourced post, call the post_local hooks as if it were
 				// posted locally so that crosspost connectors will be triggered.
 
-				if(check_item_source($arr['uid'], $arr) || ($channel['xchan_pubforum'] == 1)) {
+				if(check_item_source($arr['uid'], $arr)) {
 					/**
 					 * @hooks post_local
 					 *   Called when an item has been posted on this machine via mod/item.php (also via API).
@@ -1865,10 +1819,6 @@ class Libzot {
 
 		$ret = [];
 
-		$signer = q("select hubloc_hash, hubloc_url from hubloc where hubloc_id_url = '%s' and hubloc_network = 'zot6' limit 1",
-			dbesc($a['signature']['signer'])
-		);
-
 		foreach($a['data']['orderedItems'] as $activity) {
 
 			$AS = new ActivityStreams($activity);
@@ -1927,23 +1877,6 @@ class Libzot {
 			if($AS->data['hubloc']) {
 				$arr['item_verified'] = true;
 			}
-
-			// set comment policy depending on source hub. Unknown or osada is ActivityPub.
-			// Anything else we'll say is zot - which could have a range of project names
-
-			if ($signer) {
-				$s = q("select site_project from site where site_url = '%s' limit 1",
-					dbesc($signer[0]['hubloc_url'])
-				);
-				if ((! $s) || (in_array($s[0]['site_project'],[ '', 'osada' ]))) {
-					$arr['comment_policy'] = 'authenticated';
-				}
-				else {
-					$arr['comment_policy'] = 'contacts';
-				}
-			}
-
-
 			if($AS->data['signed_data']) {
 				IConfig::Set($arr,'activitystreams','signed_data',$AS->data['signed_data'],false);
 			}
@@ -2104,7 +2037,7 @@ class Libzot {
 		$item_found = false;
 		$post_id = 0;
 
-		$r = q("select * from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
+		$r = q("select id, author_xchan, owner_xchan, source_xchan, item_deleted from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
 			and mid = '%s' and uid = %d limit 1",
 			dbesc($sender),
 			dbesc($sender),
@@ -2114,12 +2047,10 @@ class Libzot {
 		);
 
 		if($r) {
-			$stored = $r[0];
-
-			if($stored['author_xchan'] === $sender || $stored['owner_xchan'] === $sender || $stored['source_xchan'] === $sender)
+			if($r[0]['author_xchan'] === $sender || $r[0]['owner_xchan'] === $sender || $r[0]['source_xchan'] === $sender)
 				$ownership_valid = true;
 
-			$post_id = $stored['id'];
+			$post_id = $r[0]['id'];
 			$item_found = true;
 		}
 		else {
@@ -2143,27 +2074,8 @@ class Libzot {
 			return false;
 		}
 
-		if ($stored['resource_type'] === 'event') {
-			$i = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-				dbesc($stored['resource_id']),
-				intval($uid)
-			);
-			if ($i) {
-				if ($i[0]['event_xchan'] === $sender) {
-					q("delete from event where event_hash = '%s' and uid = %d",
-						dbesc($stored['resource_id']),
-						intval($uid)
-					);
-				}
-				else {
-					logger('delete linked event: not owner');
-					return;
-				}
-			}
-		}
-
 		if($item_found) {
-			if(intval($stored['item_deleted'])) {
+			if(intval($r[0]['item_deleted'])) {
 				logger('delete_imported_item: item was already deleted');
 				if(! $relay)
 					return false;
@@ -2175,10 +2087,10 @@ class Libzot {
 				// back, and we aren't going to (or shouldn't at any rate) delete it again in the future - so losing
 				// this information from the metadata should have no other discernible impact.
 
-				if (($stored['id'] != $stored['parent']) && intval($stored['item_origin'])) {
+				if (($r[0]['id'] != $r[0]['parent']) && intval($r[0]['item_origin'])) {
 					q("update item set item_origin = 0 where id = %d and uid = %d",
-						intval($stored['id']),
-						intval($stored['uid'])
+						intval($r[0]['id']),
+						intval($r[0]['uid'])
 					);
 				}
 			}
@@ -2854,7 +2766,7 @@ class Libzot {
 
 			$profile['description']   = $p[0]['pdesc'];
 			$profile['birthday']      = $p[0]['dob'];
-			if(($profile['birthday'] != '0000-00-00') && (($bd = z_birthday($p[0]['dob'],'UTC')) !== ''))
+			if(($profile['birthday'] != '0000-00-00') && (($bd = z_birthday($p[0]['dob'],$e['channel_timezone'])) !== ''))
 				$profile['next_birthday'] = $bd;
 
 			if($age = age($p[0]['dob'],$e['channel_timezone'],''))
@@ -3195,11 +3107,7 @@ class Libzot {
 
 		foreach($arr as $v) {
 			if($v[$check] === 'zot6') {
-				return $v;
-			}
-		}
-		foreach($arr as $v) {
-			if($v[$check] === 'zot') {
+
 				return $v;
 			}
 		}

Zotlabs/Lib/NativeWiki.php

@@ -191,7 +191,7 @@ class NativeWiki {
 			return array('item' => null, 'success' => false);
 		} 
 		else {
-			$drop = drop_item($item['id'], false, DROPITEM_NORMAL);
+			$drop = drop_item($item['id'], false, DROPITEM_NORMAL, true);
 		}
 
 		info( t('Wiki files deleted successfully'));

Zotlabs/Lib/Queue.php

@@ -250,7 +250,7 @@ class Queue {
 			$host_crypto = null;
 
 			if($channel && $base) {
-				$h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_sitekey != '' order by hubloc_id desc limit 1",
+				$h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' order by hubloc_id desc limit 1",
 					dbesc($base)
 				);
 				if($h) {

Zotlabs/Lib/SvgSanitizer.php

@@ -1,150 +0,0 @@
-<?php
-
-namespace Zotlabs\Lib;
-use DomDocument;
-
-/**
- *  SVGSantiizer
- * 
- *  Whitelist-based PHP SVG sanitizer.
- * 
- *  @link https://github.com/alister-/SVG-Sanitizer}
- *  @author Alister Norris
- *  @copyright Copyright (c) 2013 Alister Norris
- *  @license http://opensource.org/licenses/mit-license.php The MIT License
- *  @package svgsanitizer
- */
-
-class SvgSanitizer {
-	
-	private $xmlDoc;				// PHP XML DOMDocument
-
-	private $removedattrs = [];
-
-	private static $allowed_functions = [ 'matrix', 'url', 'translate', 'rgb' ];
-
-	// defines the whitelist of elements and attributes allowed.
-	private static $whitelist = [
-		'a' => [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'href', 'xlink:href', 'xlink:title' ],
-		'circle' => [ 'class', 'clip-path', 'clip-rule', 'cx', 'cy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'r', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ],
-		'clipPath' => [ 'class', 'clipPathUnits', 'id' ],
-		'defs' => [ ],
-	    'style' => [ 'type' ],
-		'desc' => [ ],
-		'ellipse' => [ 'class', 'clip-path', 'clip-rule', 'cx', 'cy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ],
-		'feGaussianBlur' => [ 'class', 'color-interpolation-filters', 'id', 'requiredFeatures', 'stdDeviation' ],
-		'filter' => [ 'class', 'color-interpolation-filters', 'filterRes', 'filterUnits', 'height', 'id', 'primitiveUnits', 'requiredFeatures', 'width', 'x', 'xlink:href', 'y' ],
-		'foreignObject' => [ 'class', 'font-size', 'height', 'id', 'opacity', 'requiredFeatures', 'style', 'transform', 'width', 'x', 'y' ],
-		'g' => [ 'class', 'clip-path', 'clip-rule', 'id', 'display', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'font-family', 'font-size', 'font-style', 'font-weight', 'text-anchor' ],
-		'image' => [ 'class', 'clip-path', 'clip-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'style', 'systemLanguage', 'transform', 'width', 'x', 'xlink:href', 'xlink:title', 'y' ],
-		'line' => [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'x1', 'x2', 'y1', 'y2' ],
-		'linearGradient' => [ 'class', 'id', 'gradientTransform', 'gradientUnits', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'x1', 'x2', 'xlink:href', 'y1', 'y2' ],
-		'marker' => [ 'id', 'class', 'markerHeight', 'markerUnits', 'markerWidth', 'orient', 'preserveAspectRatio', 'refX', 'refY', 'systemLanguage', 'viewBox' ],
-		'mask' => [ 'class', 'height', 'id', 'maskContentUnits', 'maskUnits', 'width', 'x', 'y' ],
-		'metadata' => [ 'class', 'id' ],
-		'path' => [ 'class', 'clip-path', 'clip-rule', 'd', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ],
-		'pattern' => [ 'class', 'height', 'id', 'patternContentUnits', 'patternTransform', 'patternUnits', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xlink:href', 'y' ],
-		'polygon' => [ 'class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'id', 'class', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ],
-		'polyline' => [ 'class', 'clip-path', 'clip-rule', 'id', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'opacity', 'points', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform' ],
-		'radialGradient' => [ 'class', 'cx', 'cy', 'fx', 'fy', 'gradientTransform', 'gradientUnits', 'id', 'r', 'requiredFeatures', 'spreadMethod', 'systemLanguage', 'xlink:href' ],
-		'rect' => [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'opacity', 'requiredFeatures', 'rx', 'ry', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'width', 'x', 'y' ],
-		'stop' => [ 'class', 'id', 'offset', 'requiredFeatures', 'stop-color', 'stop-opacity', 'style', 'systemLanguage' ],
-		'svg' => [ 'class', 'clip-path', 'clip-rule', 'filter', 'id', 'height', 'mask', 'preserveAspectRatio', 'requiredFeatures', 'style', 'systemLanguage', 'viewBox', 'width', 'x', 'xmlns', 'xmlns:se', 'xmlns:xlink', 'y' ],
-		'switch' => [ 'class', 'id', 'requiredFeatures', 'systemLanguage' ],
-		'symbol' => [ 'class', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'opacity', 'preserveAspectRatio', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'transform', 'viewBox' ],
-		'text' => [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'mask', 'opacity', 'requiredFeatures', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'text-anchor', 'transform', 'x', 'xml:space', 'y' ],
-		'textPath' => [ 'class', 'id', 'method', 'requiredFeatures', 'spacing', 'startOffset', 'style', 'systemLanguage', 'transform', 'xlink:href' ],
-		'title' => [ ],
-		'tspan' => [ 'class', 'clip-path', 'clip-rule', 'dx', 'dy', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'font-family', 'font-size', 'font-style', 'font-weight', 'id', 'mask', 'opacity', 'requiredFeatures', 'rotate', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'systemLanguage', 'text-anchor', 'textLength', 'transform', 'x', 'xml:space', 'y' ],
-		'use' => [ 'class', 'clip-path', 'clip-rule', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'height', 'id', 'mask', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'style', 'transform', 'width', 'x', 'xlink:href', 'y' ],
-	];
-
-	function __construct() {
-		$this->xmlDoc = new DOMDocument('1.0','UTF-8');
-		$this->xmlDoc->preserveWhiteSpace = false;
-		libxml_use_internal_errors(true);
-	}
-
-	// load XML SVG
-	function load($file) {
-		$this->xmlDoc->load($file);
-	}
-
-	function loadXML($str) {
-		if (! $this->xmlDoc->loadXML($str)) {
-			logger('loadxml: ' . print_r(libxml_get_errors(),true), LOGGER_DEBUG);
-			return false;
-		}
-		return true;
-	}
-
-	function sanitize()
-	{
-		// all elements in xml doc
-		$allElements = $this->xmlDoc->getElementsByTagName('*');
-
-		// loop through all elements
-		for($i = 0; $i < $allElements->length; $i++)
-		{
-			$this->removedattrs = [];
-			
-			$currentNode = $allElements->item($i);
-
-			// logger('current_node: ' . print_r($currentNode,true));
-
-			// array of allowed attributes in specific element
-			$whitelist_attr_arr = self::$whitelist[$currentNode->tagName];
-
-			// does element exist in whitelist?
-		    if(isset($whitelist_attr_arr)) {
-					$total = $currentNode->attributes->length;
-					
-		    		for($x = 0; $x < $total; $x++) {
-
-		    			// get attributes name
-		    			$attrName = $currentNode->attributes->item($x)->nodeName;
-
-						// logger('checking: ' . print_r($currentNode->attributes->item($x),true));
-						$matches = false;
-						
-		    			// check if attribute isn't in whitelist
-		    			if(! in_array($attrName, $whitelist_attr_arr)) {
-							$this->removedattrs[] = $attrName;
-		    			}
-						// check for disallowed functions
-						elseif (preg_match_all('/([a-zA-Z0-9]+)[\s]*\(/',
-							$currentNode->attributes->item($x)->textContent,$matches,PREG_SET_ORDER)) {
-							if ($attrName === 'text') {
-								continue;
-							}
-							foreach ($matches as $match) {
-								if(! in_array($match[1],self::$allowed_functions)) {
-									logger('queue_remove_function: ' . $match[1],LOGGER_DEBUG);
-									$this->removedattrs[] = $attrName;
-								}
-							}
-						}
-		    		}	
-					if ($this->removedattrs) {
-						foreach ($this->removedattrs as $attr) {
-							$currentNode->removeAttribute($attr);
-							logger('removed: ' . $attr, LOGGER_DEBUG);
-						}
-					}
-
-			}
-
-		    // else remove element
-		    else {
-				logger('remove_node: ' . print_r($currentNode,true));
-		        $currentNode->parentNode->removeChild($currentNode);
-		    }	
-		}
-		return true;
-	}
-
-	function saveSVG() {
-		$this->xmlDoc->formatOutput = true;
-		return($this->xmlDoc->saveXML());
-	}
-}

Zotlabs/Lib/System.php

@@ -5,14 +5,9 @@ namespace Zotlabs\Lib;
 class System {
 
 	static public function get_platform_name() {
-		static $platform_name = '';
-		if(empty($platform_name)) {
-			if(is_array(\App::$config) && is_array(\App::$config['system']) && array_key_exists('platform_name',\App::$config['system']))
-				$platform_name = \App::$config['system']['platform_name'];
-			else
-				$platform_name = PLATFORM_NAME;
-		}
-		return $platform_name;
+		if(is_array(\App::$config) && is_array(\App::$config['system']) && array_key_exists('platform_name',\App::$config['system']))
+			return \App::$config['system']['platform_name'];
+		return PLATFORM_NAME;
 	}
 
 	static public function get_site_name() {

Zotlabs/Lib/ThreadItem.php

@@ -38,7 +38,6 @@ class ThreadItem {
 				
 		$this->data = $data;
 		$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
-		$this->threaded = get_config('system','thread_allow');
 
 		$observer = \App::get_observer();
 
@@ -78,7 +77,7 @@ class ThreadItem {
 	 */
 
 	public function get_template_data($conv_responses, $thread_level=1, $conv_flags = []) {
-
+	
 		$result = array();
 
 		$item     = $this->get_data();
@@ -95,10 +94,10 @@ class ThreadItem {
 		$total_children = $this->count_descendants();
 		$unseen_comments = (($item['real_uid']) ? 0 : $this->count_unseen_descendants());
 
- 		$conv = $this->get_conversation();
+		$conv = $this->get_conversation();
 		$observer = $conv->get_observer();
 
-		$lock = (((intval($item['item_private'])) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+		$lock = ((($item['item_private'] == 1) || (($item['uid'] == local_channel()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
 			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 			? t('Private Message')
 			: false);
@@ -110,7 +109,7 @@ class ThreadItem {
 			$shareable = true;
 
 		$privacy_warning = false;
-		if(intval($item['item_private']) && ($item['owner']['xchan_network'] === 'activitypub')) {
+		if(($item['item_private'] == 1) && ($item['owner']['xchan_network'] === 'activitypub')) {
 			$recips = get_iconfig($item['parent'], 'activitypub', 'recips');
 
 			if(! in_array($observer['xchan_url'], $recips['to']))
@@ -204,10 +203,6 @@ class ThreadItem {
 			}
 		}
 
-		if($item['obj_type'] === 'Question') {
-			$response_verbs[] = 'answer';
-		}
-
 		$consensus = (intval($item['item_consensus']) ? true : false);
 		if($consensus) {
 			$response_verbs[] = 'agree';
@@ -310,7 +305,6 @@ class ThreadItem {
 		if($this->is_commentable() && $observer) {
 			$like = array( t("I like this \x28toggle\x29"), t("like"));
 			$dislike = array( t("I don't like this \x28toggle\x29"), t("dislike"));
-			$reply_to = array( t("Reply on this comment"), t("reply"), t("Reply to"));
 		}
 
 		if ($shareable) {
@@ -337,6 +331,7 @@ class ThreadItem {
 		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
 			$is_new = true;
 
+
 		localize_item($item);
 
 		$body = prepare_body($item,true);
@@ -350,8 +345,12 @@ class ThreadItem {
 			$viewthread = z_root() . '/channel/' . $owner_address . '?f=&mid=' . urlencode(gen_link_id($item['mid']));
 
 		$comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
-		$list_unseen_txt = (($unseen_comments) ? sprintf( t('%d unseen'),$unseen_comments) : '');
+		$list_unseen_txt = (($unseen_comments) ? sprintf('%d unseen',$unseen_comments) : '');
 		
+		
+
+		
+
 		$children = $this->get_children();
 
 		$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
@@ -360,28 +359,11 @@ class ThreadItem {
                 call_hooks('dropdown_extras',$dropdown_extras_arr);
                 $dropdown_extras = $dropdown_extras_arr['dropdown_extras'];
 
-		$midb64 = 'b64.' . base64url_encode($item['mid']);
-		$mids = [ $midb64 ];
-		$response_mids = [];
-		foreach($response_verbs as $v) {
-			if(isset($conv_responses[$v]['mids'][$item['mid']])) {
-				$response_mids = array_merge($response_mids, $conv_responses[$v]['mids'][$item['mid']]);
-			}
-		}
-
-		$mids = array_merge($mids, $response_mids);
-		$json_mids = json_encode($mids);
-
-		// Pinned item processing
-		$allowed_type = (in_array($item['item_type'], get_config('system', 'pin_types', [ ITEM_TYPE_POST ])) ? true : false);
-		$pinned_items = ($allowed_type ? get_pconfig($item['uid'], 'pinned', $item['item_type'], []) : []);
-		$pinned = ((!empty($pinned_items) && in_array($midb64, $pinned_items)) ? true : false);
-
 		$tmp_item = array(
 			'template' => $this->get_template(),
 			'mode' => $mode,
 			'item_type' => intval($item['item_type']),			
-			//'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
+			'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
 			'body' => $body['html'],
 			'tags' => $body['tags'],
 			'categories' => $body['categories'],
@@ -390,17 +372,14 @@ class ThreadItem {
 			'folders' => $body['folders'],
 			'text' => strip_tags($body['html']),
 			'id' => $this->get_id(),
-			'mid' => $midb64,
-			'mids' => $json_mids,
-			'parent' => $item['parent'],
-			'author_id' => (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']),
+			'mid' => $item['mid'],
 			'isevent' => $isevent,
 			'attend' => $attend,
 			'consensus' => $consensus,
 			'conlabels' => $conlabels,
 			'canvote' => $canvote,
-			'linktitle' => (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']),
-			'olinktitle' => (($item['owner']['xchan_addr']) ? $item['owner']['xchan_addr'] : $item['owner']['xchan_url']),
+			'linktitle' => sprintf( t('View %s\'s profile - %s'), $profile_name, $item['author']['xchan_addr']),
+			'olinktitle' => sprintf( t('View %s\'s profile - %s'), $this->get_owner_name(), $item['owner']['xchan_addr']),
 			'llink' => $item['llink'],
 			'viewthread' => $viewthread,
 			'to' => t('to'),
@@ -418,7 +397,7 @@ class ThreadItem {
 			'sparkle' => $sparkle,
 			'title' => $item['title'],
 			'title_tosource' => get_pconfig($conv->get_profile_owner(),'system','title_tosource'),
-			//'ago' => relative_date($item['created']),
+			'ago' => relative_date($item['created']),
 			'app' => $item['app'],
 			'str_app' => sprintf( t('from %s'), $item['app']),
 			'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'),
@@ -446,11 +425,9 @@ class ThreadItem {
 			'has_tags' => $has_tags,
 			'reactions' => $this->reactions,
 // Item toolbar buttons
-			'emojis'	=> (($this->is_toplevel() && $this->is_commentable() && $observer && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''),
+			'emojis'   => (($this->is_toplevel() && $this->is_commentable() && $observer && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''),
 			'like'      => $like,
 			'dislike'   => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''),
-			'reply_to'	=> (((! $this->is_toplevel()) && feature_enabled($conv->get_profile_owner(),'reply_to')) ? $reply_to : ''),
-			'top_hint'	=> t("Go to previous comment"),
 			'share'     => $share,
 			'embed'     => $embed,
 			'rawmid'	=> $item['mid'],
@@ -459,15 +436,13 @@ class ThreadItem {
 			'star'      => ((feature_enabled($conv->get_profile_owner(),'star_posts') && ($item['item_type'] == ITEM_TYPE_POST)) ? $star : ''),
 			'tagger'    => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''),
 			'filer'     => ((feature_enabled($conv->get_profile_owner(),'filing') && ($item['item_type'] == ITEM_TYPE_POST)) ? $filer : ''),
-			'pinned'    => ($pinned ? t('Pinned post') : ''),
-			'pinnable'  => (($this->is_toplevel() && local_channel() && $item['owner_xchan'] == $observer['xchan_hash'] && $allowed_type && $item['item_private'] == 0) ? '1' : ''),
-			'pinme'     => ($pinned ? t('Unpin from the top') : t('Pin to the top')),
 			'bookmark'  => (($conv->get_profile_owner() == local_channel() && local_channel() && $has_bookmarks) ? t('Save Bookmarks') : ''),
 			'addtocal'  => (($has_event) ? t('Add to Calendar') : ''),
 			'drop'      => $drop,
 			'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''),
-			'dropdown_extras' => $dropdown_extras,
+                        'dropdown_extras' => $dropdown_extras,
 // end toolbar buttons
+
 			'unseen_comments' => $unseen_comments,
 			'comment_count' => $total_children,
 			'comment_count_txt' => $comment_count_txt,
@@ -492,9 +467,9 @@ class ThreadItem {
 			'previewing' => ($conv->is_preview() ? true : false ),
 			'preview_lbl' => t('This is an unsaved preview'),
 			'wait' => t('Please wait'),
+			'submid' => str_replace(['+','='], ['',''], base64_encode($item['mid'])),
 			'thread_level' => $thread_level,
-			'settings' => $settings,
-			'thr_parent' => (($item['parent_mid'] != $item['thr_parent']) ? 'b64.' . base64url_encode($item['thr_parent']) : '')
+			'settings' => $settings
 		);
 
 		$arr = array('item' => $item, 'output' => $tmp_item);
@@ -802,6 +777,8 @@ class ThreadItem {
 		call_hooks('comment_buttons',$arr);
 		$comment_buttons = $arr['comment_buttons'];
 		
+		$feature_auto_save_draft = ((feature_enabled($conv->get_profile_owner(), 'auto_save_draft')) ? "true" : "false");
+
 		$comment_box = replace_macros($template,array(
 			'$return_path' => '',
 			'$threaded' => $this->is_threaded(),
@@ -836,7 +813,8 @@ class ThreadItem {
 			'$anoncomments' => ((($conv->get_mode() === 'channel' || $conv->get_mode() === 'display') && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false),
 			'$anonname' => [ 'anonname', t('Your full name (required)') ],
 			'$anonmail' => [ 'anonmail', t('Your email address (required)') ],
-			'$anonurl'  => [ 'anonurl',  t('Your website URL (optional)') ]
+			'$anonurl'  => [ 'anonurl',  t('Your website URL (optional)') ],
+			'$auto_save_draft' => $feature_auto_save_draft,
 		));
 
 		return $comment_box;
@@ -887,4 +865,8 @@ class ThreadItem {
 		return $this->visiting;
 	}
 
+
+
+
 }
+

Zotlabs/Lib/ZotURL.php

@@ -2,7 +2,7 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Web\HTTPSig;
+use Zotlabs\Zot6\HTTPSig;
 
 
 class ZotURL {

Zotlabs/Lib/Zotfinger.php

@@ -2,7 +2,7 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Web\HTTPSig;
+use Zotlabs\Zot6\HTTPSig;
 
 class Zotfinger {
 

Zotlabs/Module/Acl.php

@@ -42,7 +42,7 @@ class Acl extends \Zotlabs\Web\Controller {
 
 
 		// $type =
-		//  'm'  =>  autocomplete private mail recipient (checks post_mail permission and displays only zot, diaspora, friendica-over-diaspora xchan_network xchan's)
+		//  'm'  =>  autocomplete private mail recipient (checks post_mail permission)
 		//  'a'  =>  autocomplete connections (mod_connections, mod_poke, mod_sources, mod_photos)
 		//  'x'  =>  nav search bar autocomplete (match any xchan)
 		// $_REQUEST['query'] contains autocomplete search text.
@@ -286,7 +286,6 @@ class Acl extends \Zotlabs\Web\Controller {
 				FROM abook left join xchan on abook_xchan = xchan_hash
 				WHERE abook_channel = %d 
 				and xchan_deleted = 0
-				and xchan_network IN ('zot', 'diaspora', 'friendica-over-diaspora')
 				$sql_extra3
 				ORDER BY xchan_name ASC ",
 				intval(local_channel())

Zotlabs/Module/Activity.php

@@ -1,175 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-use Zotlabs\Lib\IConfig;
-use Zotlabs\Lib\Enotify;
-use Zotlabs\Web\Controller;
-use Zotlabs\Daemon\Master;
-use Zotlabs\Lib\Activity as ZlibActivity;
-use Zotlabs\Lib\ActivityStreams;
-use Zotlabs\Lib\LDSignatures;
-use Zotlabs\Web\HTTPSig;
-use Zotlabs\Lib\Libzot;
-use Zotlabs\Lib\ThreadListener;
-use App;
-
-
-class Activity extends Controller {
-
-	function init() {
-
-		if (Libzot::is_zot_request()) {
-
-			$item_id = argv(1);
-
-			if (! $item_id)
-				http_status_exit(404, 'Not found');
-
-			$portable_id = EMPTY_STR;
-
-			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";
-
-			$i = null;
-
-			// do we have the item (at all)?
-
-			$r = q("select * from item where mid = '%s' $item_normal limit 1",
-				dbesc(z_root() . '/activity/' . $item_id)
-			);
-
-			if (! $r) {
-				http_status_exit(404,'Not found');
-			}
-
-			// process an authenticated fetch
-
-			$sigdata = HTTPSig::verify(EMPTY_STR);
-			if($sigdata['portable_id'] && $sigdata['header_valid']) {
-				$portable_id = $sigdata['portable_id'];
-				observer_auth($portable_id);
-
-				// first see if we have a copy of this item's parent owned by the current signer
-				// include xchans for all zot-like networks - these will have the same guid and public key
-
-				$x = q("select * from xchan where xchan_hash = '%s'",
-					dbesc($sigdata['portable_id'])
-				);
-
-				if ($x) {
-					$xchans = q("select xchan_hash from xchan where xchan_hash = '%s' OR ( xchan_guid = '%s' AND xchan_pubkey = '%s' ) ",
-						dbesc($sigdata['portable_id']),
-						dbesc($x[0]['xchan_guid']),
-						dbesc($x[0]['xchan_pubkey'])
-					);
-
-					if ($xchans) {
-						$hashes = ids_to_querystr($xchans,'xchan_hash',true);
-						$i = q("select id as item_id from item where mid = '%s' $item_normal and owner_xchan in ( " . protect_sprintf($hashes) . " ) limit 1",
-							dbesc($r[0]['parent_mid'])
-						);
-					}
-				}
-			}
-
-			// if we don't have a parent id belonging to the signer see if we can obtain one as a visitor that we have permission to access
-			// with a bias towards those items owned by channels on this site (item_wall = 1)
-
-			$sql_extra = item_permissions_sql(0);
-
-			if (! $i) {
-				$i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra order by item_wall desc limit 1",
-					dbesc($r[0]['parent_mid'])
-				);
-			}
-
-			if(! $i) {
-				http_status_exit(403,'Forbidden');
-			}
-
-			$parents_str = ids_to_querystr($i,'item_id');
-	
-			$items = q("SELECT item.*, item.id AS item_id FROM item WHERE item.parent IN ( %s ) $item_normal ",
-				dbesc($parents_str)
-			);
-
-			if(! $items) {
-				http_status_exit(404, 'Not found');
-			}
-
-			xchan_query($items,true);
-			$items = fetch_post_tags($items,true);
-
-			$observer = App::get_observer();
-			$parent = $items[0];
-			$recips = (($parent['owner']['xchan_network'] === 'activitypub') ? get_iconfig($parent['id'],'activitypub','recips', []) : []);
-			$to = (($recips && array_key_exists('to',$recips) && is_array($recips['to'])) ? $recips['to'] : null);
-			$nitems = [];
-			foreach($items as $i) {
-
-				$mids = [];
-
-				if(intval($i['item_private'])) {
-					if(! $observer) {
-						continue;
-					}
-					// ignore private reshare, possibly from hubzilla
-					if($i['verb'] === 'Announce') {
-						if(! in_array($i['thr_parent'],$mids)) {
-							$mids[] = $i['thr_parent'];
-						}
-						continue;
-					}
-					// also ignore any children of the private reshares
-					if(in_array($i['thr_parent'],$mids)) {
-						continue;
-					}
-
-					if((! $to) || (! in_array($observer['xchan_url'],$to))) {
-						continue;
-					}
-
-				}
-				$nitems[] = $i;
-			}
-
-			if(! $nitems)
-				http_status_exit(404, 'Not found');
-
-			$chan = channelx_by_n($nitems[0]['uid']);
-
-			if(! $chan)
-				http_status_exit(404, 'Not found');
-
-			if(! perm_is_allowed($chan['channel_id'],get_observer_hash(),'view_stream'))
-				http_status_exit(403, 'Forbidden');
-
-			$i = ZlibActivity::encode_item_collection($nitems,'conversation/' . $item_id,'OrderedCollection');
-			if($portable_id) {
-				ThreadListener::store(z_root() . '/activity/' . $item_id,$portable_id);
-			}
-
-			if(! $i)
-				http_status_exit(404, 'Not found');
-
-			$x = array_merge(['@context' => [
-				ACTIVITYSTREAMS_JSONLD_REV,
-				'https://w3id.org/security/v1',
-				z_root() . ZOT_APSCHEMA_REV
-				]], $i);
-
-			$headers = [];
-			$headers['Content-Type'] = 'application/x-zot+json' ;
-			$x['signature'] = LDSignatures::sign($x,$chan);
-			$ret = json_encode($x, JSON_UNESCAPED_SLASHES);
-			$headers['Digest'] = HTTPSig::generate_digest_header($ret);
-			$headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
-			$h = HTTPSig::create_sig($headers,$chan['channel_prvkey'],channel_url($chan));
-			HTTPSig::set_headers($h);
-			echo $ret;
-			killme();
-
-		}
-
-	}
-
-}

Zotlabs/Module/Admin/Addons.php

@@ -2,7 +2,6 @@
 
 namespace Zotlabs\Module\Admin;
 
-use App;
 use \Zotlabs\Storage\GitRepo;
 use \Michelf\MarkdownExtra;
 
@@ -254,14 +253,14 @@ class Addons {
 		 * Single plugin
 		 */
 
-		if (App::$argc == 3){
-			$plugin = App::$argv[2];
+		if (\App::$argc == 3){
+			$plugin = \App::$argv[2];
 			if (!is_file("addon/$plugin/$plugin.php")){
 				notice( t("Item not found.") );
 				return '';
 			}
 
-			$enabled = in_array($plugin,App::$plugins);
+			$enabled = in_array($plugin,\App::$plugins);
 			$info = get_plugin_info($plugin);
 			$x = check_plugin_versions($info);
 
@@ -269,11 +268,11 @@ class Addons {
 
 			if($enabled && ! $x) {
 				$enabled = false;
-				$idz = array_search($plugin, App::$plugins);
+				$idz = array_search($plugin, \App::$plugins);
 				if ($idz !== false) {
-					unset(App::$plugins[$idz]);
+					unset(\App::$plugins[$idz]);
 					uninstall_plugin($plugin);
-					set_config("system","addon", implode(", ",App::$plugins));
+					set_config("system","addon", implode(", ",\App::$plugins));
 				}
 			}
 			$info['disabled'] = 1-intval($x);
@@ -282,19 +281,19 @@ class Addons {
 				check_form_security_token_redirectOnErr('/admin/addons', 'admin_addons', 't');
 				$pinstalled = false;
 				// Toggle plugin status
-				$idx = array_search($plugin, App::$plugins);
+				$idx = array_search($plugin, \App::$plugins);
 				if ($idx !== false){
-					unset(App::$plugins[$idx]);
+					unset(\App::$plugins[$idx]);
 					uninstall_plugin($plugin);
 					$pinstalled = false;
 					info( sprintf( t("Plugin %s disabled."), $plugin ) );
 				} else {
-					App::$plugins[] = $plugin;
+					\App::$plugins[] = $plugin;
 					install_plugin($plugin);
 					$pinstalled = true;
 					info( sprintf( t("Plugin %s enabled."), $plugin ) );
 				}
-				set_config("system","addon", implode(", ",App::$plugins));
+				set_config("system","addon", implode(", ",\App::$plugins));
 
 				if($pinstalled) {
 					@require_once("addon/$plugin/$plugin.php");
@@ -306,7 +305,7 @@ class Addons {
 
 			// display plugin details
 
-			if (in_array($plugin, App::$plugins)){
+			if (in_array($plugin, \App::$plugins)){
 				$status = 'on';
 				$action = t('Disable');
 			} else {
@@ -381,18 +380,18 @@ class Addons {
 
 					list($tmp, $id) = array_map('trim', explode('/', $file));
 					$info = get_plugin_info($id);
-					$enabled = in_array($id,App::$plugins);
+					$enabled = in_array($id,\App::$plugins);
 					$x = check_plugin_versions($info);
 
 					// disable plugins which are installed but incompatible versions
 
 					if($enabled && ! $x) {
 						$enabled = false;
-						$idz = array_search($id, App::$plugins);
+						$idz = array_search($id, \App::$plugins);
 						if ($idz !== false) {
-							unset(App::$plugins[$idz]);
+							unset(\App::$plugins[$idz]);
 							uninstall_plugin($id);
-							set_config("system","addon", implode(", ",App::$plugins));
+							set_config("system","addon", implode(", ",\App::$plugins));
 						}
 					}
 					$info['disabled'] = 1-intval($x);

Zotlabs/Module/Admin/Dbsync.php

@@ -19,47 +19,7 @@ class Dbsync {
 			info( t('Update has been marked successful') . EOL);
 			goaway(z_root() . '/admin/dbsync');
 		}
-
-		if(argc() > 3 && intval(argv(3)) && argv(2) === 'verify') {
-
-			$s = '_' . intval(argv(3));
-			$cls = '\\Zotlabs\Update\\' . $s ;
-			if(class_exists($cls)) {
-				$c =  new $cls();
-				if(method_exists($c,'verify')) {
-					$retval = $c->verify();
-					if($retval === UPDATE_FAILED) {
-						$o .= sprintf( t('Verification of update %s failed. Check system logs.'), $s); 
-					}
-					elseif($retval === UPDATE_SUCCESS) {
-						$o .= sprintf( t('Update %s was successfully applied.'), $s);
-						set_config('database',$s, 'success');
-					}
-					else
-						$o .= sprintf( t('Verifying update %s did not return a status. Unknown if it succeeded.'), $s);
-				}
-				else {
-						$o .= sprintf( t('Update %s does not contain a verification function.'), $s );
-				}
-			}
-			else
-				$o .= sprintf( t('Update function %s could not be found.'), $s);
 	
-			return $o;
-
-
-
-
-
-			// remove the old style config if it exists
-			del_config('database', 'update_r' . intval(argv(3)));
-			set_config('database', '_' . intval(argv(3)), 'success');
-			if(intval(get_config('system','db_version')) < intval(argv(3)))
-				set_config('system','db_version',intval(argv(3)));
-			info( t('Update has been marked successful') . EOL);
-			goaway(z_root() . '/admin/dbsync');
-		}
-
 		if(argc() > 2 && intval(argv(2))) {
 			$x = intval(argv(2));
 			$s = '_' . $x;
@@ -68,14 +28,14 @@ class Dbsync {
 				$c =  new $cls();
 				$retval = $c->run();
 				if($retval === UPDATE_FAILED) {
-					$o .= sprintf( t('Executing update procedure %s failed. Check system logs.'), $s); 
+					$o .= sprintf( t('Executing %s failed. Check system logs.'), $s); 
 				}
 				elseif($retval === UPDATE_SUCCESS) {
 					$o .= sprintf( t('Update %s was successfully applied.'), $s);
 					set_config('database',$s, 'success');
 				}
 				else
-					$o .= sprintf( t('Update %s did not return a status. It cannot be determined if it was successful.'), $s);
+					$o .= sprintf( t('Update %s did not return a status. Unknown if it succeeded.'), $s);
 			}
 			else
 				$o .= sprintf( t('Update function %s could not be found.'), $s);
@@ -99,7 +59,6 @@ class Dbsync {
 				'$banner' => t('Failed Updates'),
 				'$desc'   => '',
 				'$mark'   => t('Mark success (if update was manually applied)'),
-				'$verify' => t('Attempt to verify this update if a verification procedure exists'),
 				'$apply'  => t('Attempt to execute this update step automatically'),
 				'$failed' => $failed
 		));

Zotlabs/Module/Admin/Security.php

@@ -43,12 +43,6 @@ class Security {
 	
 		$be = $this->trim_array_elems(explode("\n",$_POST['embed_deny']));
 		set_config('system','embed_deny',$be);
-
-		$thumbnail_security = ((x($_POST,'thumbnail_security')) ? intval($_POST['thumbnail_security']) : 0);
-		set_config('system', 'thumbnail_security' , $thumbnail_security);
-
-		$inline_pdf = ((x($_POST,'inline_pdf')) ? intval($_POST['inline_pdf']) : 0);
-		set_config('system', 'inline_pdf' , $inline_pdf);
 	
 		$ts = ((x($_POST,'transport_security')) ? True : False);
 		set_config('system','transport_security_header',$ts);
@@ -92,7 +86,7 @@ class Security {
 		$embedhelp2 = t("The recommended setting is to only allow unfiltered HTML from the following sites:"); 
 		$embedhelp3 = t("https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />");
 		$embedhelp4 = t("All other embedded content will be filtered, <strong>unless</strong> embedded content from that site is explicitly blocked.");
-
+	
 		$t = get_markup_template('admin_security.tpl');
 		return replace_macros($t, array(
 			'$title' => t('Administration'),
@@ -112,9 +106,7 @@ class Security {
 			'$embed_sslonly' => array('embed_sslonly',t('Only allow embeds from secure (SSL) websites and links.'), intval(get_config('system','embed_sslonly')),''),
 			'$embed_allow' => array('embed_allow', t('Allow unfiltered embedded HTML content only from these domains'), $whiteembeds_str, t('One site per line. By default embedded content is filtered.')),
 			'$embed_deny' => array('embed_deny', t('Block embedded HTML from these domains'), $blackembeds_str, ''),
-			'$thumbnail_security'   => [ 'thumbnail_security', t("Allow SVG thumbnails in file browser"), get_config('system','thumbnail_security',0), t("WARNING: SVG images may contain malicious code.") ],
-			'$inline_pdf'   => [ 'inline_pdf', t("Allow embedded (inline) PDF files"), get_config('system','inline_pdf',0), '' ],
-
+	
 //	        '$embed_coop'     => array('embed_coop', t('Cooperative embed security'), $embed_coop, t('Enable to share embed security with other compatible sites/hubs')),
 
 			'$submit' => t('Submit')
@@ -136,4 +128,4 @@ class Security {
 	}
 	
 	
-}
+}

Zotlabs/Module/Admin/Site.php

@@ -73,6 +73,7 @@ class Site {
 		$feed_contacts     = ((x($_POST,'feed_contacts'))    ? intval($_POST['feed_contacts'])    : 0);
 		$verify_email      = ((x($_POST,'verify_email'))     ? 1 : 0);
 		$imagick_path      = ((x($_POST,'imagick_path'))     ? trim($_POST['imagick_path'])   : '');
+		$thumbnail_security  = ((x($_POST,'thumbnail_security'))     ? intval($_POST['thumbnail_security'])   : 0);
 		$force_queue       = ((intval($_POST['force_queue']) > 0) ? intval($_POST['force_queue'])   : 3000);
 		$pub_incl = escape_tags(trim($_POST['pub_incl']));
 		$pub_excl = escape_tags(trim($_POST['pub_excl']));
@@ -99,6 +100,7 @@ class Site {
 		set_config('system', 'from_email', $from_email);
 		set_config('system', 'from_email_name' , $from_email_name);
 		set_config('system', 'imagick_convert_path' , $imagick_path);
+		set_config('system', 'thumbnail_security' , $thumbnail_security);
 		set_config('system', 'default_permissions_role', $permissions_role);
 		set_config('system', 'pubstream_incl',$pub_incl);
 		set_config('system', 'pubstream_excl',$pub_excl);
@@ -339,6 +341,7 @@ class Site {
 			'$force_queue'			=> array('force_queue', t("Queue Threshold"), get_config('system','force_queue_threshold',3000), t("Always defer immediate delivery if queue contains more than this number of entries.")),
 			'$poll_interval'			=> array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
 			'$imagick_path'			=> array('imagick_path', t("Path to ImageMagick convert program"), get_config('system','imagick_convert_path'), t("If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert")),
+			'$thumbnail_security'			=> array('thumbnail_security', t("Allow SVG thumbnails in file browser"), get_config('system','thumbnail_security',0), t("WARNING: SVG images may contain malicious code.")),
 			'$maxloadavg'			=> array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
 			'$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')),
 			'$active_expire_days' => array('active_expire_days', t('Do not expire any posts which have comments less than this many days ago'), intval(get_config('system','active_expire_days',7)), ''),

Zotlabs/Module/Apschema.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace Zotlabs\Module;
-
-
-class Apschema extends \Zotlabs\Web\Controller {
-
-	function init() {
-
-		$base = z_root();
-
-		$arr = [
-			'@context' => [
-				'zot'              => z_root() . '/apschema#',
-				'id'               => '@id',
-				'type'             => '@type',
-				'commentPolicy'    => 'as:commentPolicy',
-				'meData'           => 'zot:meData',
-				'meDataType'       => 'zot:meDataType',
-				'meEncoding'       => 'zot:meEncoding',
-				'meAlgorithm'      => 'zot:meAlgorithm',
-				'meCreator'        => 'zot:meCreator',
-				'meSignatureValue' => 'zot:meSignatureValue',
-				'locationAddress'  => 'zot:locationAddress',
-				'locationPrimary'  => 'zot:locationPrimary',
-				'locationDeleted'  => 'zot:locationDeleted',
-				'nomadicLocation'  => 'zot:nomadicLocation',
-				'nomadicHubs'      => 'zot:nomadicHubs',
-				'emojiReaction'    => 'zot:emojiReaction',
-				'expires'          => 'zot:expires',
-				'directMessage'    => 'zot:directMessage',
-				 
-				'magicEnv' => [
-					'@id'   => 'zot:magicEnv',
-					'@type' => '@id'
-				],
-
-				'nomadicLocations' => [
-					'@id'   => 'zot:nomadicLocations',
-					'@type' => '@id'
-				],
-
-				'ostatus'      => 'http://ostatus.org#',
-				'conversation' => 'ostatus:conversation',
-
-				'diaspora'     => 'https://diasporafoundation.org/ns/',
-				'guid'         => 'diaspora:guid',
-
-				'Hashtag'      => 'as:Hashtag'
-				
-			]
-		];
-
-		header('Content-Type: application/ld+json');
-		echo json_encode($arr,JSON_UNESCAPED_SLASHES);
-		killme();
-
-	}
-
-
-
-
-}

Zotlabs/Module/Article_edit.php

@@ -85,9 +85,10 @@ class Article_edit extends \Zotlabs\Web\Controller {
 
 		$mimetype = $itm[0]['mimetype'];
 
-		$summary = (($itm[0]['summary']) ? '[summary]' . $itm[0]['summary'] . '[/summary]' . "\r\n" : '');
 		$content = $itm[0]['body'];
 
+
+
 		$rp = 'articles/' . $channel['channel_address'];
 
 		$x = array(
@@ -109,7 +110,7 @@ class Article_edit extends \Zotlabs\Web\Controller {
 			'ptyp' => $itm[0]['type'],
 			'mimeselect' => false,
 			'mimetype' => $itm[0]['mimetype'],
-			'body' => $summary . undo_post_tagging($content),
+			'body' => undo_post_tagging($content),
 			'post_id' => $post_id,
 			'visitor' => true,
 			'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),

Zotlabs/Module/Articles.php

@@ -9,7 +9,6 @@ use Zotlabs\Lib\PermissionDescription;
 require_once('include/channel.php');
 require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
-require_once('include/opengraph.php');
 
 
 class Articles extends Controller {
@@ -193,7 +192,7 @@ class Articles extends Controller {
 
 			$parents_str = ids_to_querystr($r,'id');
 
-			$r = q("SELECT item.*, item.id AS item_id
+			$items = q("SELECT item.*, item.id AS item_id
 				FROM item
 				WHERE item.uid = %d $item_normal
 				AND item.parent IN ( %s )
@@ -201,18 +200,15 @@ class Articles extends Controller {
 				intval(App::$profile['profile_uid']),
 				dbesc($parents_str)
 			);
-			if($r) {
-				xchan_query($r);
-				$items = fetch_post_tags($r, true);
+			if($items) {
+				xchan_query($items);
+				$items = fetch_post_tags($items, true);
 				$items = conv_sort($items,'updated');
 			}
 			else
 				$items = [];
 		}
 
-		// Add Opengraph markup
-		opengraph_add_meta((! empty($items) ? $r[0] : []), $channel);
-
 		$mode = 'articles';
 			
 		if(get_pconfig(local_channel(),'system','articles_list_mode') && (! $selected_card))

Zotlabs/Module/Cal.php

@@ -1,10 +1,6 @@
 <?php
 namespace Zotlabs\Module;
 
-
-use App;
-use Zotlabs\Web\Controller;
-
 require_once('include/conversation.php');
 require_once('include/bbcode.php');
 require_once('include/datetime.php');
@@ -13,13 +9,15 @@ require_once('include/items.php');
 require_once('include/html2plain.php');
 
 
-class Cal extends Controller {
+class Cal extends \Zotlabs\Web\Controller {
 
 	function init() {
 		if(observer_prohibited()) {
 			return;
 		}
 	
+		$o = '';
+	
 		if(argc() > 1) {
 			$nick = argv(1);
 	
@@ -27,21 +25,19 @@ class Cal extends Controller {
 	
 			$channelx = channelx_by_nick($nick);
 	
-			if(! $channelx) {
-				notice( t('Channel not found.') . EOL);
+			if(! $channelx)
 				return;
-			}
 	
-			App::$data['channel'] = $channelx;
+			\App::$data['channel'] = $channelx;
 	
-			$observer = App::get_observer();
-			App::$data['observer'] = $observer;
+			$observer = \App::get_observer();
+			\App::$data['observer'] = $observer;
 	
 			$observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
 	
-			head_set_icon(App::$data['channel']['xchan_photo_s']);
+			head_set_icon(\App::$data['channel']['xchan_photo_s']);
 	
-			App::$page['htmlhead'] .= "<script> var profile_uid = " . ((App::$data['channel']) ? App::$data['channel']['channel_id'] : 0) . "; </script>" ;
+			\App::$page['htmlhead'] .= "<script> var profile_uid = " . ((\App::$data['channel']) ? \App::$data['channel']['channel_id'] : 0) . "; </script>" ;
 	
 		}
 	
@@ -56,8 +52,18 @@ class Cal extends Controller {
 			return;
 		}
 		
-		$channel = App::$data['channel'];
-
+		$channel = null;
+	
+		if(argc() > 1) {
+			$channel = channelx_by_nick(argv(1));
+		}
+	
+	
+		if(! $channel) {
+			notice( t('Channel not found.') . EOL);
+			return;
+		}
+	
 		// since we don't currently have an event permission - use the stream permission
 	
 		if(! perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_stream')) {
@@ -66,152 +72,287 @@ class Cal extends Controller {
 		}
 
 		nav_set_selected('Calendar');
-
-		head_add_css('/library/fullcalendar/packages/core/main.min.css');
-		head_add_css('/library/fullcalendar/packages/daygrid/main.min.css');
-		head_add_css('cdav_calendar.css');
-
-		head_add_js('/library/fullcalendar/packages/core/main.min.js');
-		head_add_js('/library/fullcalendar/packages/daygrid/main.min.js');
-
-		$sql_extra = permissions_sql($channel['channel_id'], get_observer_hash(), 'event');
-
-		if(! perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_contacts') || App::$profile['hide_friends'])
-			$sql_extra .= " and etype != 'birthday' ";
 	
-		$first_day = feature_enabled($channel['channel_id'], 'cal_first_day');
+		$sql_extra = permissions_sql($channel['channel_id'],get_observer_hash(),'event');
+	
+		$first_day = feature_enabled($channel['channel_id'], 'events_cal_first_day');
 		$first_day = (($first_day) ? $first_day : 0);
 	
-		$start = '';
-		$finish = '';
-
-		if (argv(2) === 'json') {
-			if (x($_GET,'start'))	$start = $_GET['start'];
-			if (x($_GET,'end'))	$finish = $_GET['end'];
+		$htpl = get_markup_template('event_head.tpl');
+		\App::$page['htmlhead'] .= replace_macros($htpl,array(
+			'$baseurl' => z_root(),
+			'$module_url' => '/cal/' . $channel['channel_address'],
+			'$modparams' => 2,
+			'$lang' => \App::$language,
+			'$first_day' => $first_day
+		));
+	
+		$o = '';
+	
+		$mode = 'view';
+		$y = 0;
+		$m = 0;
+		$ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " "  : '');
+	
+		// logger('args: ' . print_r(\App::$argv,true));
+	
+		if(argc() > 3 && intval(argv(2)) && intval(argv(3))) {
+			$mode = 'view';
+			$y = intval(argv(2));
+			$m = intval(argv(3));
+		}
+		if(argc() <= 3) {
+			$mode = 'view';
+			$event_id = argv(2);
 		}
 	
-		$start  = datetime_convert('UTC','UTC',$start);
-		$finish = datetime_convert('UTC','UTC',$finish);
-		$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
-		$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
-
-		if (x($_GET, 'id')) {
-			$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
-                                from event left join item on item.resource_id = event.event_hash
-				where item.resource_type = 'event' and event.uid = %d and event.id = %d $sql_extra limit 1",
-				intval($channel['channel_id']),
-				intval($_GET['id'])
-			);
-		}
-		else {
-			// fixed an issue with "nofinish" events not showing up in the calendar.
-			// There's still an issue if the finish date crosses the end of month.
-			// Noting this for now - it will need to be fixed here and in Friendica.
-			// Ultimately the finish date shouldn't be involved in the query.
-			$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
-				from event left join item on event.event_hash = item.resource_id 
-				where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid 
-				AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' ) 
-				OR (  event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )) 
-				$sql_extra",
-				intval($channel['channel_id']),
-				dbesc($start),
-				dbesc($finish),
-				dbesc($adjust_start),
-				dbesc($adjust_finish)
-			);
-		}
+		if($mode == 'view') {
 	
-		if($r) {
-			xchan_query($r);
-			$r = fetch_post_tags($r,true);
-			$r = sort_by_date($r);
-		}
-
-		$events = [];
-	
-		if($r) {
-
-			foreach($r as $rr) {
-
-				$tz = get_iconfig($rr, 'event', 'timezone');
-				if(! $tz)
-					$tz = 'UTC';
-
-				$start = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
-				if ($rr['nofinish']){
-					$end = null;
-				} else {
-					$end = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
-				}
-
-				$html = '';
-				if (x($_GET,'id')) {
-					$rr['timezone'] = $tz;
-					$html = format_event_html($rr);
-				}
-
-				$events[] = array(
-					'calendar_id' => 'channel_calendar',
-					'rw' => true,
-					'id'=>$rr['id'],
-					'uri' => $rr['event_hash'],
-					'timezone' => $tz,
-					'start'=> $start,
-					'end' => $end,
-					'drop' => $drop,
-					'allDay' => (($rr['adjust']) ? 0 : 1),
-					'title' => html_entity_decode($rr['summary'], ENT_COMPAT, 'UTF-8'),
-					'editable' => $edit ? true : false,
-					'item' => $rr,
-					'plink' => [$rr['plink'], t('Link to source')],
-					'description' => html_entity_decode($rr['description'], ENT_COMPAT, 'UTF-8'),
-					'location' => html_entity_decode($rr['location'], ENT_COMPAT, 'UTF-8'),
-					'allow_cid' => expand_acl($rr['allow_cid']),
-					'allow_gid' => expand_acl($rr['allow_gid']),
-					'deny_cid' => expand_acl($rr['deny_cid']),
-					'deny_gid' => expand_acl($rr['deny_gid']),
-					'html' => $html
+			/* edit/create form */
+			if($event_id) {
+				$r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+					dbesc($event_id),
+					intval($channel['channel_id'])
 				);
+				if(count($r))
+					$orig_event = $r[0];
 			}
-		}
+	
+	
+			// Passed parameters overrides anything found in the DB
+			if(!x($orig_event))
+				$orig_event = array();
+	
+	
+	
+			$tz = date_default_timezone_get();
+			if(x($orig_event))
+				$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
+	
+			$syear = datetime_convert('UTC', $tz, $sdt, 'Y');
+			$smonth = datetime_convert('UTC', $tz, $sdt, 'm');
+			$sday = datetime_convert('UTC', $tz, $sdt, 'd');
+			$shour = datetime_convert('UTC', $tz, $sdt, 'H');
+			$sminute = datetime_convert('UTC', $tz, $sdt, 'i');
+	
+			$stext = datetime_convert('UTC',$tz,$sdt);
+			$stext = substr($stext,0,14) . "00:00";
+	
+			$fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
+			$fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
+			$fday = datetime_convert('UTC', $tz, $fdt, 'd');
+			$fhour = datetime_convert('UTC', $tz, $fdt, 'H');
+			$fminute = datetime_convert('UTC', $tz, $fdt, 'i');
+	
+			$ftext = datetime_convert('UTC',$tz,$fdt);
+			$ftext = substr($ftext,0,14) . "00:00";
+	
+			$type = ((x($orig_event)) ? $orig_event['etype'] : 'event');
+	
+			$f = get_config('system','event_input_format');
+			if(! $f)
+				$f = 'ymd';
+	
+			$catsenabled = feature_enabled($channel['channel_id'],'categories');
+	
+	
+			$show_bd = perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_contacts');
+			if(! $show_bd) {
+				$sql_extra .= " and event.etype != 'birthday' ";
+			}
+	
+	
+			$category = '';
+	
+			$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
+			$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
+			if(! $y)
+				$y = intval($thisyear);
+			if(! $m)
+				$m = intval($thismonth);
+	
+			// Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
+			// An upper limit was chosen to keep search engines from exploring links millions of years in the future. 
+	
+			if($y < 1901)
+				$y = 1900;
+			if($y > 2099)
+				$y = 2100;
+	
+			$nextyear = $y;
+			$nextmonth = $m + 1;
+			if($nextmonth > 12) {
+					$nextmonth = 1;
+				$nextyear ++;
+			}
+	
+			$prevyear = $y;
+			if($m > 1)
+				$prevmonth = $m - 1;
+			else {
+				$prevmonth = 12;
+				$prevyear --;
+			}
+				
+			$dim    = get_dim($y,$m);
+			$start  = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0);
+			$finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59);
+	
+	
+			if (argv(2) === 'json'){
+				if (x($_GET,'start'))	$start = $_GET['start'];
+				if (x($_GET,'end'))	$finish = $_GET['end'];
+			}
+	
+			$start  = datetime_convert('UTC','UTC',$start);
+			$finish = datetime_convert('UTC','UTC',$finish);
+	
+			$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
+			$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
+	
 
-		if (argv(2) === 'json') {
-			echo json_encode($events);
-			killme();
-		}
+			if(! perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'view_contacts'))
+				$sql_extra .= " and etype != 'birthday' ";
+
+			if (x($_GET,'id')){
+			  	$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
+	                                from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d $sql_extra limit 1",
+					intval($channel['channel_id']),
+					intval($_GET['id'])
+				);
+			} 
+			else {
+				// fixed an issue with "nofinish" events not showing up in the calendar.
+				// There's still an issue if the finish date crosses the end of month.
+				// Noting this for now - it will need to be fixed here and in Friendica.
+				// Ultimately the finish date shouldn't be involved in the query. 
+	
+				$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
+	                              from event left join item on event_hash = resource_id 
+					where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
+					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
+					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) $sql_extra ",
+					intval($channel['channel_id']),
+					dbesc($start),
+					dbesc($finish),
+					dbesc($adjust_start),
+					dbesc($adjust_finish)
+				);
+	
+			}
+	
+			$links = array();
+	
+			if($r) {
+				xchan_query($r);
+				$r = fetch_post_tags($r,true);
+	
+				$r = sort_by_date($r);
+			}
+	
+			if($r) {
+				foreach($r as $rr) {
+					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
+					if(! x($links,$j)) 
+						$links[$j] = z_root() . '/' . \App::$cmd . '#link-' . $j;
+				}
+			}
+	
+			$events=array();
+	
+			$last_date = '';
+			$fmt = t('l, F j');
+	
+			if($r) {
+	
+				foreach($r as $rr) {
+					
+					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
+					$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt));
+					$d = day_translate($d);
+					
+					$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c'));
+					if ($rr['nofinish']){
+						$end = null;
+					} else {
+						$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c'));
+					}
+					
+					
+					$is_first = ($d !== $last_date);
+						
+					$last_date = $d;
+	
+					$edit = false;
+	
+					$drop = false;
+	
+					$title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
+					if(! $title) {
+						list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
+						$title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
+					}
+					$html = format_event_html($rr);
+					$rr['desc'] = zidify_links(smilies(bbcode($rr['desc'])));
+					$rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8',false);
+					$rr['location'] = zidify_links(smilies(bbcode($rr['location'])));
+					$events[] = array(
+						'id'=>$rr['id'],
+						'hash' => $rr['event_hash'],
+						'start'=> $start,
+						'end' => $end,
+						'drop' => $drop,
+						'allDay' => false,
+						'title' => $title,
+						
+						'j' => $j,
+						'd' => $d,
+						'edit' => $edit,
+						'is_first'=>$is_first,
+						'item'=>$rr,
+						'html'=>$html,
+						'plink' => array($rr['plink'],t('Link to Source'),'',''),
+					);
+	
+	
+				}
+			}
 			
-		if (x($_GET,'id')) {
-			$o = replace_macros(get_markup_template("cal_event.tpl"), [
-				'$events' => $events
-			]);
-			echo $o;
-			killme();
+			if (argv(2) === 'json'){
+				echo json_encode($events); killme();
+			}
+			
+			// links: array('href', 'text', 'extra css classes', 'title')
+			if (x($_GET,'id')){
+				$tpl =  get_markup_template("event_cal.tpl");
+			} 
+			else {
+				$tpl = get_markup_template("events_cal-js.tpl");
+			}
+	
+			$nick = $channel['channel_address'];
+	
+			$o = replace_macros($tpl, array(
+				'$baseurl'	=> z_root(),
+				'$new_event'	=> array(z_root().'/cal',(($event_id) ? t('Edit Event') : t('Create Event')),'',''),
+				'$previus'	=> array(z_root()."/cal/$nick/$prevyear/$prevmonth",t('Previous'),'',''),
+				'$next'		=> array(z_root()."/cal/$nick/$nextyear/$nextmonth",t('Next'),'',''),
+				'$export'	=> array(z_root()."/cal/$nick/$y/$m/export",t('Export'),'',''),
+				'$calendar'	=> cal($y,$m,$links, ' eventcal'),
+				'$events'	=> $events,
+				'$upload'	=> t('Import'),
+				'$submit'	=> t('Submit'),
+				'$prev'		=> t('Previous'),
+				'$next'		=> t('Next'),
+				'$today'	=> t('Today'),
+				'$form'		=> $form,
+				'$expandform'	=> ((x($_GET,'expandform')) ? true : false)
+			));
+			
+			if (x($_GET,'id')){ echo $o; killme(); }
+			
+			return $o;
 		}
-
-		$nick = $channel['channel_address'];
-
-		$sources = '{
-			id: \'channel_calendar\',
-			url: \'/cal/' . $nick . '/json/\',
-			color: \'#3a87ad\'
-		}';
-
-		$o = replace_macros(get_markup_template("cal_calendar.tpl"), [
-			'$sources' => $sources,
-			'$lang' => App::$language,
-			'$timezone' => date_default_timezone_get(),
-			'$first_day' => $first_day,
-			'$prev'	=> t('Previous'),
-			'$next'	=> t('Next'),
-			'$today' => t('Today'),
-			'$title' => $title,
-			'$dtstart' => $dtstart,
-			'$dtend' => $dtend,
-			'$nick' => $nick
-		]);
-
-		return $o;
 	
 	}
 	

Zotlabs/Module/Channel.php

@@ -6,14 +6,13 @@ namespace Zotlabs\Module;
 use App;
 use Zotlabs\Web\Controller;
 use Zotlabs\Lib\PermissionDescription;
-use Zotlabs\Web\HTTPSig;
+use Zotlabs\Zot6\HTTPSig;
 use Zotlabs\Lib\Libzot;
 
 require_once('include/items.php');
 require_once('include/security.php');
 require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
-require_once('include/opengraph.php');
 
 
 /**
@@ -47,14 +46,14 @@ class Channel extends Controller {
 		$channel = App::get_channel();
 
 		if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-			$which = $channel['channel_address'];
-			$profile = argv(1);
-		}
+            $which = $channel['channel_address'];
+            $profile = argv(1);
+        }
 
 		$channel = channelx_by_nick($which);
-		if(! $channel) {
-			http_status_exit(404, 'Not found');
-		}
+        if(! $channel) {
+            http_status_exit(404, 'Not found');
+        }
 
 		// handle zot6 channel discovery 
 
@@ -110,20 +109,8 @@ class Channel extends Controller {
 
 		// Run profile_load() here to make sure the theme is set before
 		// we start loading content
+
 		profile_load($which,$profile);
-		
-		// Add Opengraph markup
-		$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
-		if(strpos($mid,'b64.') === 0)
-		    $mid = @base64url_decode(substr($mid,4));
-		    
-		if($mid)
-		    $r = q("SELECT * FROM item WHERE mid = '%s' AND uid = %d AND item_private = 0 LIMIT 1",
-		        dbesc($mid),
-		        intval($channel['channel_id'])
-		    );
-		    
-		opengraph_add_meta($r ? $r[0] : [], $channel);
 	}
 
 	function get($update = 0, $load = false) {
@@ -323,6 +310,10 @@ class Channel extends Controller {
 				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
 			}
 
+			if($datequery || $datequery2) {
+				$sql_extra2 .= " and item.item_thread_top != 0 ";
+			}
+
 			if($order === 'post')
 				$ordering = "created";
 			else
@@ -351,7 +342,7 @@ class Channel extends Controller {
 						AND (abook.abook_blocked = 0 or abook.abook_flags is null)
 						AND item.item_wall = 1 AND item.item_thread_top = 1
 						$sql_extra $sql_extra2 
-						ORDER BY $ordering DESC, item_id $pager_sql ",
+						ORDER BY $ordering DESC $pager_sql ",
 						intval(App::$profile['profile_uid'])
 					);
 				}
@@ -364,7 +355,7 @@ class Channel extends Controller {
 
 			$parents_str = ids_to_querystr($r,'item_id');
 
-			$r = q("SELECT item.*, item.id AS item_id
+			$items = q("SELECT item.*, item.id AS item_id
 				FROM item
 				WHERE item.uid = %d $item_normal
 				AND item.parent IN ( %s )
@@ -373,8 +364,8 @@ class Channel extends Controller {
 				dbesc($parents_str)
 			);
 
-			xchan_query($r);
-			$items = fetch_post_tags($r, true);
+			xchan_query($items);
+			$items = fetch_post_tags($items, true);
 			$items = conv_sort($items,$ordering);
 
 			if($load && $mid && (! count($items))) {
@@ -419,7 +410,6 @@ class Channel extends Controller {
 				'$nouveau' => '0',
 				'$wall' => '1',
 				'$fh' => '0',
-				'$dm' => '0',
 				'$static'  => $static,
 				'$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
 				'$search' => $search,
@@ -469,13 +459,6 @@ class Channel extends Controller {
 				);
 			}
 		}
-		
-		// Add pinned content
-		if(! x($_REQUEST,'mid') && ! $search) {
-		    $pinned = new \Zotlabs\Widget\Pinned;
-		    $r = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]);
-		    $o .= $r['html'];
-        }
 
 		$mode = (($search) ? 'search' : 'channel');
 

Zotlabs/Module/Channel_calendar.php

@@ -1,495 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-require_once('include/conversation.php');
-require_once('include/bbcode.php');
-require_once('include/datetime.php');
-require_once('include/event.php');
-require_once('include/items.php');
-require_once('include/html2plain.php');
-
-class Channel_calendar extends \Zotlabs\Web\Controller {
-
-	function post() {
-	
-		logger('post: ' . print_r($_REQUEST,true), LOGGER_DATA);
-	
-		if(! local_channel())
-			return;
-	
-		$event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
-		$event_hash = ((x($_POST,'event_hash')) ? $_POST['event_hash'] : '');
-	
-		$xchan = ((x($_POST,'xchan')) ? dbesc($_POST['xchan']) : '');
-		$uid = local_channel();
-
-		// only allow editing your own events. 
-		if(($xchan) && ($xchan !== get_observer_hash()))
-			return;
-
-		$timezone = ((x($_POST,'timezone_select')) ? escape_tags(trim($_POST['timezone_select'])) : '');
-		$tz = (($timezone) ? $timezone : date_default_timezone_get());
-
-		$categories = escape_tags(trim($_POST['categories']));
-		
-		$adjust = intval($_POST['adjust']);
-
-		$start = datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtstart']));
-		$finish = datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtend']));
-
-		$summary  = escape_tags(trim($_POST['summary']));
-		$desc     = escape_tags(trim($_POST['desc']));
-		$location = escape_tags(trim($_POST['location']));
-		$type     = escape_tags(trim($_POST['type']));
-
-		// Don't allow the event to finish before it begins.
-		// It won't hurt anything, but somebody will file a bug report
-		// and we'll waste a bunch of time responding to it. Time that 
-		// could've been spent doing something else. 
-	
-		if(strcmp($finish,$start) < 0 && !$nofinish) {
-			notice( t('Event can not end before it has started.') . EOL);
-			if(intval($_REQUEST['preview'])) {
-				echo( t('Unable to generate preview.'));
-			}
-			killme();
-		}
-	
-		if((! $summary) || (! $start)) {
-			notice( t('Event title and start time are required.') . EOL);
-			if(intval($_REQUEST['preview'])) {
-				echo( t('Unable to generate preview.'));
-			}
-			killme();
-		}
-
-		$channel = \App::get_channel();
-	
-		$acl = new \Zotlabs\Access\AccessList(false);
-	
-		if($event_id) {
-			$x = q("select * from event where id = %d and uid = %d limit 1",
-				intval($event_id),
-				intval(local_channel())
-			);
-			if(! $x) {
-				notice( t('Event not found.') . EOL);
-				if(intval($_REQUEST['preview'])) {
-					echo( t('Unable to generate preview.'));
-					killme();
-				}
-				return;
-			}
-	
-			$acl->set($x[0]);
-	
-			$created = $x[0]['created'];
-			$edited = datetime_convert();
-		}
-		else {
-			$created = $edited = datetime_convert();
-			$acl->set_from_array($_POST);
-		}
-	
-		$post_tags = array();
-		$channel = \App::get_channel();
-		$ac = $acl->get();
-
-		$str_contact_allow = $ac['allow_cid'];
-		$str_group_allow   = $ac['allow_gid'];
-		$str_contact_deny = $ac['deny_cid'];
-		$str_group_deny = $ac['deny_gid'];
-
-		$private = $acl->is_private();
-
-		require_once('include/text.php');
-		$results = linkify_tags($desc, local_channel());
-
-		if($results) {
-			// Set permissions based on tag replacements
-			set_linkified_perms($results, $str_contact_allow, $str_group_allow, local_channel(), false, $private);
-
-			foreach($results as $result) {
-				$success = $result['success'];
-				if($success['replaced']) {
-					$post_tags[] = array(
-						'uid'   => local_channel(),
-						'ttype' => $success['termtype'],
-						'otype' => TERM_OBJ_POST,
-						'term'  => $success['term'],
-						'url'   => $success['url']
-					);	
-				}
-			}
-		}
-
-		if(strlen($categories)) {
-			$cats = explode(',',$categories);
-			foreach($cats as $cat) {
-				$post_tags[] = array(
-					'uid'   => local_channel(),
-					'ttype' => TERM_CATEGORY,
-					'otype' => TERM_OBJ_POST,
-					'term'  => trim($cat),
-					'url'   => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($cat))
-				);
-			}
-		}
-	
-		$datarray = array();
-		$datarray['dtstart'] = $start;
-		$datarray['dtend'] = $finish;
-		$datarray['summary'] = $summary;
-		$datarray['description'] = $desc;
-		$datarray['location'] = $location;
-		$datarray['etype'] = $type;
-		$datarray['adjust'] = $adjust;
-		$datarray['nofinish'] = 0;
-		$datarray['uid'] = local_channel();
-		$datarray['account'] = get_account_id();
-		$datarray['event_xchan'] = $channel['channel_hash'];
-		$datarray['allow_cid'] = $str_contact_allow;
-		$datarray['allow_gid'] = $str_group_allow;
-		$datarray['deny_cid'] = $str_contact_deny;
-		$datarray['deny_gid'] = $str_group_deny;
-		$datarray['private'] = intval($private);
-		$datarray['id'] = $event_id;
-		$datarray['created'] = $created;
-		$datarray['edited'] = $edited;
-		$datarray['timezone'] = $tz;
-
-	
-		if(intval($_REQUEST['preview'])) {
-			$html = format_event_html($datarray);
-			echo $html;
-			killme();
-		}
-	
-		$event = event_store_event($datarray);
-	
-		if($post_tags)	
-			$datarray['term'] = $post_tags;
-	
-		$item_id = event_store_item($datarray,$event);
-	
-		if($item_id) {
-			$r = q("select * from item where id = %d",
-				intval($item_id)
-			);
-			if($r) {
-				xchan_query($r);
-				$sync_item = fetch_post_tags($r);
-				$z = q("select * from event where event_hash = '%s' and uid = %d limit 1",
-					dbesc($r[0]['resource_id']),
-					intval($channel['channel_id'])
-				);
-				if($z) {
-					build_sync_packet($channel['channel_id'],array('event_item' => array(encode_item($sync_item[0],true)),'event' => $z));
-				}
-			}
-		}
-	
-		\Zotlabs\Daemon\Master::Summon(array('Notifier','event',$item_id));
-
-		killme();
-	
-	}
-	
-	
-	
-	function get() {
-	
-		if(argc() > 2 && argv(1) == 'ical') {
-			$event_id = argv(2);
-	
-			require_once('include/security.php');
-			$sql_extra = permissions_sql(local_channel());
-	
-			$r = q("select * from event where event_hash = '%s' $sql_extra limit 1",
-				dbesc($event_id)
-			);
-			if($r) { 
-				header('Content-type: text/calendar');
-				header('content-disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"' );
-				echo ical_wrapper($r);
-				killme();
-			}
-			else {
-				notice( t('Event not found.') . EOL );
-				return;
-			}
-		}
-	
-		if(! local_channel()) {
-			notice( t('Permission denied.') . EOL);
-			return;
-		}
-
-		if((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
-			$r = q("update event set dismissed = 1 where id = %d and uid = %d",
-				intval(argv(2)),
-				intval(local_channel())
-			);
-		}
-	
-		if((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) {
-			$r = q("update event set dismissed = 0 where id = %d and uid = %d",
-				intval(argv(2)),
-				intval(local_channel())
-			);
-		}
-
-		$channel = \App::get_channel();
-	
-		$mode = 'view';
-		$export = false;
-		$ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " "  : '');
-
-		if(argc() > 1) {
-			if(argc() > 2 && argv(1) === 'add') {
-				$mode = 'add';
-				$item_id = intval(argv(2));
-			}
-			if(argc() > 2 && argv(1) === 'drop') {
-				$mode = 'drop';
-				$event_id = argv(2);
-			}
-			if(argc() <= 2 && argv(1) === 'export') {
-				$export = true;
-			}
-			if(argc() > 2 && intval(argv(1)) && intval(argv(2))) {
-				$mode = 'view';
-			}
-			if(argc() <= 2) {
-				$mode = 'view';
-				$event_id = argv(1);
-			}
-		}
-	
-		if($mode === 'add') {
-			event_addtocal($item_id,local_channel());
-			killme();
-		}
-	
-		if($mode == 'view') {
-	
-			/* edit/create form */
-			if($event_id) {
-				$r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-					dbesc($event_id),
-					intval(local_channel())
-				);
-				if(count($r))
-					$orig_event = $r[0];
-			}
-	
-			$channel = \App::get_channel();
-
-			if (argv(1) === 'json'){
-				if (x($_GET,'start'))	$start = $_GET['start'];
-				if (x($_GET,'end'))	$finish = $_GET['end'];
-			}
-	
-			$start  = datetime_convert('UTC','UTC',$start);
-			$finish = datetime_convert('UTC','UTC',$finish);
-			$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
-			$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
-
-			if (x($_GET,'id')){
-			  	$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
-	                                from event left join item on item.resource_id = event.event_hash
-					where item.resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
-					intval(local_channel()),
-					intval($_GET['id'])
-				);
-			}
-			elseif($export) {
-				$r = q("SELECT event.*, item.id as item_id
-					from event left join item on item.resource_id = event.event_hash
-					where event.uid = %d and event.dtstart > '%s' and event.dtend > event.dtstart",
-					intval(local_channel()),
-					dbesc(NULL_DATE)
-				);
-			}
-			else {
-				// fixed an issue with "nofinish" events not showing up in the calendar.
-				// There's still an issue if the finish date crosses the end of month.
-				// Noting this for now - it will need to be fixed here and in Friendica.
-				// Ultimately the finish date shouldn't be involved in the query. 
-
-				$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
-					from event left join item on event.event_hash = item.resource_id 
-					where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
-					AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' ) 
-					OR  (  event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )) ",
-					intval(local_channel()),
-					dbesc($start),
-					dbesc($finish),
-					dbesc($adjust_start),
-					dbesc($adjust_finish)
-				);
-			}
-	
-			if($r && ! $export) {
-				xchan_query($r);
-				$r = fetch_post_tags($r,true);
-				$r = sort_by_date($r);
-			}
-
-			$events = [];
-	
-			if($r) {
-	
-				foreach($r as $rr) {
-
-					$tz = get_iconfig($rr, 'event', 'timezone');
-
-					if(! $tz)
-						$tz = 'UTC';
-
-					$start = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
-					if ($rr['nofinish']){
-						$end = null;
-					} else {
-						$end = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
-					}
-
-					$catsenabled = feature_enabled(local_channel(),'categories');
-					$categories = '';
-					if($catsenabled){
-						if($rr['term']) {
-							$cats = get_terms_oftype($rr['term'], TERM_CATEGORY);
-							foreach ($cats as $cat) {
-								if(strlen($categories))
-									$categories .= ', ';
-								$categories .= $cat['term'];
-							}
-						}
-					}
-
-					$edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false);
-	
-					$drop = array(z_root().'/events/drop/'.$rr['event_hash'],t('Delete event'),'','');
-	
-					$events[] = array(
-						'calendar_id' => 'channel_calendar',
-						'rw' => true,
-						'id'=>$rr['id'],
-						'uri' => $rr['event_hash'],
-						'timezone' => $tz,
-						'start'=> $start,
-						'end' => $end,
-						'drop' => $drop,
-						'allDay' => (($rr['adjust']) ? 0 : 1),
-						'title' => html_entity_decode($rr['summary'], ENT_COMPAT, 'UTF-8'),
-						'editable' => $edit ? true : false,
-						'item' => $rr,
-						'plink' => [$rr['plink'], t('Link to source')],
-						'description' => html_entity_decode($rr['description'], ENT_COMPAT, 'UTF-8'),
-						'location' => html_entity_decode($rr['location'], ENT_COMPAT, 'UTF-8'),
-						'allow_cid' => expand_acl($rr['allow_cid']),
-						'allow_gid' => expand_acl($rr['allow_gid']),
-						'deny_cid' => expand_acl($rr['deny_cid']),
-						'deny_gid' => expand_acl($rr['deny_gid']),
-						'categories' => $categories
-					);
-				}
-			}
-			
-			if($export) {
-				header('Content-type: text/calendar');
-				header('content-disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"' );
-				echo ical_wrapper($r);
-				killme();
-			}
-
-			if (\App::$argv[1] === 'json'){
-				json_return_and_die($events);
-			}
-		}
-
-	
-		if($mode === 'drop' && $event_id) {
-			$r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-				dbesc($event_id),
-				intval(local_channel())
-			);
-	
-			$sync_event = $r[0];
-	
-			if($r) {
-				$r = q("delete from event where event_hash = '%s' and uid = %d",
-					dbesc($event_id),
-					intval(local_channel())
-				);
-
-				if($r) {
-
-					$sync_event['event_deleted'] = 1;
-					build_sync_packet(0,array('event' => array($sync_event)));
-
-					$i = q("select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d",
-						dbesc($event_id),
-						intval(local_channel())
-					);
-
-					if ($i) {
-
-						$can_delete = false;
-						$local_delete = true;
-
-						$ob_hash = get_observer_hash();
-						if($ob_hash && ($ob_hash === $i[0]['author_xchan'] || $ob_hash === $i[0]['owner_xchan'] || $ob_hash === $i[0]['source_xchan'])) {
-							$can_delete = true;
-						}
-
-						// The site admin can delete any post/item on the site.
-						// If the item originated on this site+channel the deletion will propagate downstream. 
-						// Otherwise just the local copy is removed.
-
-						if(is_site_admin()) {
-							$local_delete = true;
-							if(intval($i[0]['item_origin']))
-								$can_delete = true;
-						}
-
-						if($can_delete || $local_delete) {
-
-							// if this is a different page type or it's just a local delete
-							// but not by the item author or owner, do a simple deletion
-
-							$complex = false;	
-
-							if(intval($i[0]['item_type']) || ($local_delete && (! $can_delete))) {
-								drop_item($i[0]['id']);
-							}
-							else {
-								// complex deletion that needs to propagate and be performed in phases
-								drop_item($i[0]['id'],true,DROPITEM_PHASE1);
-								$complex = true;
-							}
-
-							$ii = q("select * from item where id = %d",
-								intval($i[0]['id'])
-							);
-							if($ii) {
-								xchan_query($ii);
-								$sync_item = fetch_post_tags($ii);
-								build_sync_packet($i[0]['uid'],array('item' => array(encode_item($sync_item[0],true))));
-							}
-
-							if($complex) {
-								tag_deliver($i[0]['uid'],$i[0]['id']);
-							}
-						}
-					}
-					killme();
-				}
-				notice( t('Failed to remove event' ) . EOL);
-				killme();
-			}
-		}
-	
-	}
-	
-}

Zotlabs/Module/Cloud.php

@@ -35,6 +35,13 @@ class Cloud extends \Zotlabs\Web\Controller {
 		if (argc() > 1)
 			$which = argv(1);
 
+
+		if (argc() < 2 && intval(get_config('system','cloud_disable_siteroot'))) {
+			notice( t('Permission denied.') . EOL);
+			construct_page();
+			killme();
+		}
+
 		$profile = 0;
 
 		if ($which)

Zotlabs/Module/Connections.php

@@ -283,28 +283,6 @@ class Connections extends \Zotlabs\Web\Controller {
 					if(! intval(get_abconfig(local_channel(),$rr['xchan_hash'],'their_perms','post_comments'))) {
 						$oneway = true;
 					}
-
-					$perminfo['connpermcount']=0;
-					$perminfo['connperms']=t('Accepts').': ';
-					if(intval(get_abconfig(local_channel(),$rr['xchan_hash'],'their_perms','post_comments'))) {
-						$perminfo['connpermcount']++;
-						$perminfo['connperms'] .= t('Comments');
-					}
-					if(intval(get_abconfig(local_channel(),$rr['xchan_hash'],'their_perms','send_stream'))) {
-						$perminfo['connpermcount']++;
-						$perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ', ' : $perminfo['connperms'] ;
-						$perminfo['connperms'] .= t('Stream items');
-					}
-					if(intval(get_abconfig(local_channel(),$rr['xchan_hash'],'their_perms','post_wall'))) {
-						$perminfo['connpermcount']++;
-						$perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ', ' : $perminfo['connperms'] ;
-						$perminfo['connperms'] .= t('Wall posts');
-					}
-
-					if ($perminfo['connpermcount'] == 0) {
-						$perminfo['connperms'] .= t('Nothing');
-					}
-
 	
 					foreach($status as $str) {
 						if(!$str)
@@ -344,11 +322,7 @@ class Connections extends \Zotlabs\Web\Controller {
 						'ignore' => ((! $rr['abook_ignored']) ? t('Ignore') : false),
 						'recent_label' => t('Recent activity'),
 						'recentlink' => z_root() . '/network/?f=&cid=' . intval($rr['abook_id']) . '&name=' . $rr['xchan_name'],
-						'oneway' => $oneway,
-						'perminfo' => $perminfo,
-						'connect' => (intval($rr['abook_not_here']) ? t('Connect') : ''),
-						'follow' => z_root() . '/follow/?f=&url=' . urlencode($rr['xchan_hash']) . '&interactive=0',
-						'connect_hover' => t('Connect at this location')
+						'oneway' => $oneway
 					);
 				}
 			}

Zotlabs/Module/Cover_photo.php

@@ -68,10 +68,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 				if($sync)
 				    build_sync_packet($channel['channel_id'],array('file' => array($sync)));
 			}
-
-			// Update directory in background
-			\Zotlabs\Daemon\Master::Summon(array('Directory',$channel['channel_id']));
-
+			
 			goaway(z_root() . '/cover_photo');
 		}
 	        
@@ -132,7 +129,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 						if(file_exists($tmp_name)) {
 							$base_image = $r[0];
 							$gis = getimagesize($tmp_name);
-							logger('gis: ' . print_r($gis,true), LOGGER_DEBUG);
+logger('gis: ' . print_r($gis,true));
 							$base_image['width'] = $gis[0];
 							$base_image['height'] = $gis[1];
 							$base_image['content'] = @file_get_contents($tmp_name);
@@ -193,18 +190,25 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 						'filename'     => $base_image['filename'], 
 						'album'        => t('Cover Photos'),
 						'os_path'      => $base_image['os_path'],
-						'display_path' => $base_image['display_path'],
-						'photo_usage'  => PHOTO_COVER
+						'display_path' => $base_image['display_path']
 					];
-					
-					$r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200);
+	
+					$p['imgscale'] = 7;
+					$p['photo_usage'] = PHOTO_COVER;
+	
+					$r1 = $im->save($p);
 	
 					$im->doScaleImage(850,310);
-					$r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850);
+					$p['imgscale'] = 8;
+	
+					$r2 = $im->save($p);
+	
 	
 					$im->doScaleImage(425,160);
-					$r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425);
-					
+					$p['imgscale'] = 9;
+	
+					$r3 = $im->save($p);
+				
 					if($r1 === false || $r2 === false || $r3 === false) {
 						// if one failed, delete them all so we can start over.
 						notice( t('Image resize failed.') . EOL );
@@ -212,17 +216,6 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 							dbesc($base_image['resource_id']),
 							local_channel()
 						);
-						
-						$x = q("SELECT content FROM photo WHERE resource_id = '%s' AND uid = %d AND os_storage = 1 AND imgscale >= 7",
-							dbesc($base_image['resource_id']),
-							local_channel()
-						);
-						if($x) {
-							foreach($x as $xx) {
-								@unlink(dbunescbin($xx['content']));
-							}
-						}
-
 						return;
 					}
 
@@ -231,9 +224,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 					$sync = attach_export_data($channel,$base_image['resource_id']);
 					if($sync)
 					    build_sync_packet($channel['channel_id'],array('file' => array($sync)));
-
-					// Update directory in background
-					\Zotlabs\Daemon\Master::Summon(array('Directory',$channel['channel_id']));
+	
 				}
 				else
 					notice( t('Unable to process image') . EOL);

Zotlabs/Module/Dav.php

@@ -8,9 +8,8 @@
 
 namespace Zotlabs\Module;
 
-use Sabre\DAV as SDAV;
-use Zotlabs\Storage;
-use Zotlabs\Web\HTTPSig;
+use \Sabre\DAV as SDAV;
+use \Zotlabs\Storage;
 
 require_once('include/attach.php');
 require_once('include/auth.php');
@@ -47,7 +46,7 @@ class Dav extends \Zotlabs\Web\Controller {
 					continue;
 				}
 
-				$sigblock = HTTPSig::parse_sigheader($_SERVER[$head]);
+				$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
 				if($sigblock) {
 					$keyId = str_replace('acct:','',$sigblock['keyId']);
 					if($keyId) {
@@ -70,7 +69,7 @@ class Dav extends \Zotlabs\Web\Controller {
 							continue;
 
 						if($record) {
-							$verified = HTTPSig::verify('',$record['channel']['channel_pubkey']);
+							$verified = \Zotlabs\Web\HTTPSig::verify('',$record['channel']['channel_pubkey']);
 							if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
 								$record = null;
 							}
@@ -95,8 +94,6 @@ class Dav extends \Zotlabs\Web\Controller {
 
 
 		$auth = new \Zotlabs\Storage\BasicAuth();
-		$auth->observer = get_observer_hash();
-
 		$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . ' ' . 'WebDAV');
 
 		$rootDirectory = new \Zotlabs\Storage\Directory('/', $auth);

Zotlabs/Module/Dircensor.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace Zotlabs\Module;
-
-use App;
-use Zotlabs\Web\Controller;
-
-
-class Dircensor extends Controller {
-
-	function get() {
-		if(! is_site_admin()) {
-			return;
-		}
-
-		$dirmode = intval(get_config('system','directory_mode'));
-
-		if (! ($dirmode == DIRECTORY_MODE_PRIMARY || $dirmode == DIRECTORY_MODE_STANDALONE)) {
-			return;
-		}
-
-		$xchan = argv(1);
-		if(! $xchan) {
-			return;
-		}
-
-		$r = q("select * from xchan where xchan_hash = '%s'",
-			dbesc($xchan)
-		);
-
-		if(! $r) {
-			return;
-		}
-
-		$val = (($r[0]['xchan_censored']) ? 0 : 1);
-
-		q("update xchan set xchan_censored = $val where xchan_hash = '%s'",
-			dbesc($xchan)
-		);
-
-		if($val) {
-			info( t('Entry censored') . EOL);
-		}
-		else {
-			info( t('Entry uncensored') . EOL);
-		}
-		
-		goaway(z_root() . '/directory');
-
-	}
-
-}

Zotlabs/Module/Directory.php

@@ -2,19 +2,15 @@
 
 namespace Zotlabs\Module;
 
-use App;
-use Zotlabs\Web\Controller;
-
 require_once('include/socgraph.php');
 require_once('include/dir_fns.php');
 require_once('include/bbcode.php');
-require_once('include/html2plain.php');
 
 
-class Directory extends Controller {
+class Directory extends \Zotlabs\Web\Controller {
 
 	function init() {
-		App::set_pager_itemspage(60);
+		\App::set_pager_itemspage(60);
 	
 		if(local_channel() && x($_GET,'ignore')) {
 			q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ",
@@ -25,7 +21,7 @@ class Directory extends Controller {
 		}
 
 		if(local_channel())
-			App::$profile_uid = local_channel();
+			\App::$profile_uid = local_channel();
 	
 		$observer = get_observer_hash();
 		$global_changed = false;
@@ -107,14 +103,8 @@ class Directory extends Controller {
 		$suggest = (local_channel() && x($_REQUEST,'suggest')) ? $_REQUEST['suggest'] : '';
 	
 		if($suggest) {
-
-			// the directory options have no effect in suggestion mode
-			
-			$globaldir = 1;
-			$safe_mode = 1;
-			$type = 0;
-
-			$r = suggestion_query(local_channel(),get_observer_hash(),0,60);
+	
+			$r = suggestion_query(local_channel(),get_observer_hash());
 
 			if(! $r) {
 				notice( t('No default suggestions were found.') . EOL);
@@ -144,15 +134,9 @@ class Directory extends Controller {
 	
 		$dirmode = intval(get_config('system','directory_mode'));
 	
-		$directory_admin = false;
-
 		if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
 			$url = z_root() . '/dirsearch';
-			if (is_site_admin()) {
-				$directory_admin = true;
-			}
- 		}
-
+		}
 		if(! $url) {
 			$directory = find_upstream_directory($dirmode);
 			if((! $directory) || (! array_key_exists('url',$directory)) || (! $directory['url']))
@@ -192,7 +176,7 @@ class Directory extends Controller {
 				$query .= '&t=' . $token;
 	
 			if(! $globaldir)
-				$query .= '&hub=' . App::get_hostname();
+				$query .= '&hub=' . \App::get_hostname();
 	
 			if($search)
 				$query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search);
@@ -214,8 +198,8 @@ class Directory extends Controller {
 			if($sort_order)
 				$query .= '&order=' . urlencode($sort_order);
 				
-			if(App::$pager['page'] != 1)
-				$query .= '&p=' . App::$pager['page'];
+			if(\App::$pager['page'] != 1)
+				$query .= '&p=' . \App::$pager['page'];
 	
 			logger('mod_directory: query: ' . $query);
 	
@@ -228,17 +212,12 @@ class Directory extends Controller {
 				if($j) {
 	
 					if($j['results']) {
-
-						$results = $j['results'];
-						if($suggest) {
-							$results = self::reorder_results($results,$addresses);
-						}
-
+	
 						$entries = array();
 	
 						$photo = 'thumb';
 	
-						foreach($results as $rr) {
+						foreach($j['results'] as $rr) {
 	
 							$profile_link = chanlink_url($rr['url']);
 			
@@ -293,15 +272,12 @@ class Directory extends Controller {
 							$marital = ((x($profile,'marital') == 1) ?  t('Status: ') . $profile['marital']: False);
 			
 							$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage: ') : False);
-							$homepageurl = ((x($profile,'homepage') == 1) ?  html2plain($profile['homepage']) : ''); 
+							$homepageurl = ((x($profile,'homepage') == 1) ?  $profile['homepage'] : ''); 
 	
-							$hometown = ((x($profile,'hometown') == 1) ? html2plain($profile['hometown'])  : False);
+							$hometown = ((x($profile,'hometown') == 1) ? $profile['hometown']  : False);
+	
+							$about = ((x($profile,'about') == 1) ? zidify_links(bbcode($profile['about'])) : False);
 	
-							$about = ((x($profile,'about') == 1) ? zidify_links(bbcode($profile['about'], ['tryoembed' => false])) : False);
-							if ($about && $safe_mode) {
-								$about = html2plain($about);
-							}
-							
 							$keywords = ((x($profile,'keywords')) ? $profile['keywords'] : '');
 	
 
@@ -356,11 +332,9 @@ class Directory extends Controller {
 								'canrate' => (($rating_enabled && local_channel()) ? true : false),
 								'pdesc'	=> $pdesc,
 								'pdesc_label' => t('Description:'),
-								'censor' => (($directory_admin) ? 'dircensor/' . $rr['hash'] : ''),
-								'censor_label' => (($rr['censored']) ? t('Uncensor') : t('Censor')),
 								'marital'  => $marital,
 								'homepage' => $homepage,
-								'homepageurl' => (($safe_mode) ? $homepageurl : linkify($homepageurl)),
+								'homepageurl' => linkify($homepageurl),
 								'hometown' => $hometown,
 								'hometown_label' => t('Hometown:'),
 								'about' => $about,
@@ -402,7 +376,7 @@ class Directory extends Controller {
 						ksort($entries); // Sort array by key so that foreach-constructs work as expected
 	
 						if($j['keywords']) {
-							App::$data['directory_keywords'] = $j['keywords'];
+							\App::$data['directory_keywords'] = $j['keywords'];
 						}
 	
 						logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);
@@ -453,7 +427,7 @@ class Directory extends Controller {
 							echo $o;
 							killme();
 						}
-						if(App::$pager['page'] == 1 && $j['records'] == 0 && strpos($search,'@')) {
+						if(\App::$pager['page'] == 1 && $j['records'] == 0 && strpos($search,'@')) {
 							goaway(z_root() . '/chanview/?f=&address=' . $search);
 						}
 						info( t("No entries (some entries may be hidden).") . EOL);
@@ -464,22 +438,5 @@ class Directory extends Controller {
 		return $o;
 	}
 	
-	static public function reorder_results($results,$suggests) {
-
-		if(! $suggests)
-			return $results;
-
-		$out = [];
-		foreach($suggests as $k => $v) {
-			foreach($results as $rv) {
-				if($k == $rv['address']) {
-					$out[intval($v)] = $rv;
-					break;
-				}
-			}
-		}
-
-		return $out;
-	}
-
+	
 }

Zotlabs/Module/Dirsearch.php

@@ -1,17 +1,14 @@
 <?php
 namespace Zotlabs\Module;
 
-use App;
-use Zotlabs\Web\Controller;
-
 require_once('include/dir_fns.php');
 
 
 
-class Dirsearch extends Controller {
+class Dirsearch extends \Zotlabs\Web\Controller {
 
 	function init() {
-		App::set_pager_itemspage(60);
+		\App::set_pager_itemspage(60);
 	
 	}
 	
@@ -28,8 +25,7 @@ class Dirsearch extends Controller {
 			$ret['message'] = t('This site is not a directory server');
 			json_return_and_die($ret);
 		}
-
-
+	
 		$access_token = $_REQUEST['t'];
 	
 		$token = get_config('system','realm_token');
@@ -290,29 +286,29 @@ class Dirsearch extends Controller {
 				else
 					$entry['total_ratings'] = 0;
 	
-				$entry['name']         = $rr['xchan_name'];
-				$entry['hash']         = $rr['xchan_hash'];
-				$entry['censored']     = $rr['xchan_censored'];
-				$entry['selfcensored'] = $rr['xchan_selfcensored'];
+				$entry['name']        = $rr['xchan_name'];
+				$entry['hash']        = $rr['xchan_hash'];
+	
 				$entry['public_forum'] = (intval($rr['xchan_pubforum']) ? true : false);
-				$entry['url']          = $rr['xchan_url'];
-				$entry['photo_l']      = $rr['xchan_photo_l'];
-				$entry['photo']        = $rr['xchan_photo_m'];
-				$entry['address']      = $rr['xchan_addr'];
-				$entry['description']  = $rr['xprof_desc'];
-				$entry['locale']       = $rr['xprof_locale'];
-				$entry['region']       = $rr['xprof_region'];
-				$entry['postcode']     = $rr['xprof_postcode'];
-				$entry['country']      = $rr['xprof_country'];
-				$entry['birthday']     = $rr['xprof_dob'];
-				$entry['age']          = $rr['xprof_age'];
-				$entry['gender']       = $rr['xprof_gender'];
-				$entry['marital']      = $rr['xprof_marital'];
-				$entry['sexual']       = $rr['xprof_sexual'];
-				$entry['about']        = $rr['xprof_about'];
-				$entry['homepage']     = $rr['xprof_homepage'];
-				$entry['hometown']     = $rr['xprof_hometown'];
-				$entry['keywords']     = $rr['xprof_keywords'];
+	
+				$entry['url']         = $rr['xchan_url'];
+				$entry['photo_l']     = $rr['xchan_photo_l'];
+				$entry['photo']       = $rr['xchan_photo_m'];
+				$entry['address']     = $rr['xchan_addr'];
+				$entry['description'] = $rr['xprof_desc'];
+				$entry['locale']      = $rr['xprof_locale'];
+				$entry['region']      = $rr['xprof_region'];
+				$entry['postcode']    = $rr['xprof_postcode'];
+				$entry['country']     = $rr['xprof_country'];
+				$entry['birthday']    = $rr['xprof_dob'];
+				$entry['age']         = $rr['xprof_age'];
+				$entry['gender']      = $rr['xprof_gender'];
+				$entry['marital']     = $rr['xprof_marital'];
+				$entry['sexual']      = $rr['xprof_sexual'];
+				$entry['about']       = $rr['xprof_about'];
+				$entry['homepage']    = $rr['xprof_homepage'];
+				$entry['hometown']    = $rr['xprof_hometown'];
+				$entry['keywords']    = $rr['xprof_keywords'];
 	
 				$entries[] = $entry;
 	
@@ -398,7 +394,7 @@ class Dirsearch extends Controller {
 						$quoted_string = false;
 					}
 					else
-						$curr['value'] .= ' ' . trim($q);
+						$curr['value'] .= ' ' . trim(q);
 				}
 			}
 		}

Zotlabs/Module/Display.php

@@ -200,8 +200,7 @@ class Display extends \Zotlabs\Web\Controller {
 
 			// if the target item is not a post (eg a like) we want to address its thread parent
 
-			//$mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
-			$mid = $target_item['mid'];
+			$mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
 
 			// if we got a decoded hash we must encode it again before handing to javascript 
 			if($decoded)
@@ -224,7 +223,6 @@ class Display extends \Zotlabs\Web\Controller {
 				'$conv'    => '0',
 				'$spam'    => '0',
 				'$fh'      => '0',
-				'$dm'      => '0',
 				'$nouveau' => '0',
 				'$wall'    => '0',
 				'$static'  => $static,

Zotlabs/Module/Editpost.php

@@ -45,8 +45,7 @@ class Editpost extends \Zotlabs\Web\Controller {
 		}
 
 		if($itm[0]['resource_type'] === 'event' && $itm[0]['resource_id']) {
-			goaway(z_root() . '/cdav/calendar/' . $itm[0]['resource_id']);
-			//goaway(z_root() . '/events/' . $itm[0]['resource_id'] . '?expandform=1');
+			goaway(z_root() . '/events/' . $itm[0]['resource_id'] . '?expandform=1');
 		}
 
 		$owner_uid = $itm[0]['uid'];

Zotlabs/Module/Embedphotos.php

@@ -41,46 +41,24 @@ class Embedphotos extends \Zotlabs\Web\Controller {
 				json_return_and_die(array('errormsg' => 'Error retrieving link ' . $href, 'status' => false));
 			}
 			$resource_id = array_pop(explode('/', $href));
-			$x = self::photolink($resource_id);
-			if($x) 
-				json_return_and_die(array('status' => true, 'photolink' => $x, 'resource_id' => $resource_id));
-			json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false));
-		}
-	}
-
-
-	protected static function photolink($resource) {
-		$channel = \App::get_channel();
-		$output = EMPTY_STR;
-		if($channel) {
-			$resolution = ((feature_enabled($channel['channel_id'],'large_photos')) ? 1 : 2);
-			$r = q("select mimetype, height, width from photo where resource_id = '%s' and $resolution = %d and uid = %d limit 1",
-				dbesc($resource),
-				intval($resolution),
-				intval($channel['channel_id'])
+			$r = q("SELECT obj from item where resource_type = 'photo' and resource_id = '%s' limit 1",
+				dbesc($resource_id)
 			);
-			if(! $r)
-				return $output;
-
-			if($r[0]['mimetype'] === 'image/jpeg')
-				$ext = '.jpg';
-			elseif($r[0]['mimetype'] === 'image/png')
-				$ext = '.png';
-			elseif($r[0]['mimetype'] === 'image/gif')
-				$ext = '.gif';
-			elseif($r[0]['mimetype'] === 'image/webp')
-				$exp = '.webp';
-			else
-				$ext = EMPTY_STR;
-
-			$output = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $resource . ']' .
-				'[zmg=' . $r[0]['width'] . 'x' . $r[0]['height'] . ']' . z_root() . '/photo/' . $resource . '-' . $resolution .  $ext . '[/zmg][/zrl]';
-
-			return $output;
+			if (!$r) {
+				json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false));
+			}
+			$obj = json_decode($r[0]['obj'], true);
+			if (x($obj, 'body')) {
+				$photolink = $obj['body'];
+			} elseif (x($obj, 'bbcode')) {
+				$photolink = $obj['bbcode'];
+			} else {
+				json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false));
+			}
+			json_return_and_die(array('status' => true, 'photolink' => $photolink, 'resource_id' => $resource_id));
 		}
 	}
 
-
 	/**
 	 * @brief Get photos from an album.
 	 *

Zotlabs/Module/Event.php

@@ -1,76 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-use Zotlabs\Web\Controller;
-use Zotlabs\Lib\ActivityStreams;
-use Zotlabs\Lib\Activity;
-use Zotlabs\Lib\LDSignatures;
-use Zotlabs\Web\HTTPSig;
-
-class Event extends Controller {
-
-	function init() {
-
-		if(ActivityStreams::is_as_request()) {
-			$item_id = argv(1);
-
-			if(! $item_id)
-				return;
-
-			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 
-				and item.item_delayed = 0 and item.item_blocked = 0 ";
-
-			$sql_extra = item_permissions_sql(0);
-
-			$r = q("select * from item where mid like '%s' $item_normal $sql_extra limit 1",
-				dbesc(z_root() . '/activity/' . $item_id . '%')
-			);
-
-			if(! $r) {
-				$r = q("select * from item where mid like '%s' $item_normal limit 1",
-					dbesc(z_root() . '/activity/' . $item_id . '%')
-				);
-
-				if($r) {
-					http_status_exit(403, 'Forbidden');
-				}
-				http_status_exit(404, 'Not found');
-			}
-
-			xchan_query($r,true);
-			$items = fetch_post_tags($r,true);
-
-			$channel = channelx_by_n($items[0]['uid']);
-
-			if(! is_array($items[0]['obj'])) {
-				$obj = json_decode($items[0]['obj'],true);
-			}
-			else {
-				$obj = $items[0]['obj'];
-			}
-
-			$x = array_merge(['@context' => [
-				ACTIVITYSTREAMS_JSONLD_REV,
-				'https://w3id.org/security/v1',
-				z_root() . ZOT_APSCHEMA_REV
-				]], $obj );
-
-			$headers = [];
-			$headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ;
-			$x['signature'] = LDSignatures::sign($x,$channel);
-			$ret = json_encode($x, JSON_UNESCAPED_SLASHES);
-			$headers['Date'] = datetime_convert('UTC','UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T');
-			$headers['Digest'] = HTTPSig::generate_digest_header($ret);
-			$headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
-
-			$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel));
-			HTTPSig::set_headers($h);
-
-			echo $ret;
-			killme();
-
-		}
-
-	}
-
-}

Zotlabs/Module/Events.php

@@ -11,9 +11,6 @@ require_once('include/html2plain.php');
 class Events extends \Zotlabs\Web\Controller {
 
 	function post() {
-
-		// this module is deprecated
-		return;
 	
 		logger('post: ' . print_r($_REQUEST,true), LOGGER_DATA);
 	
@@ -248,9 +245,6 @@ class Events extends \Zotlabs\Web\Controller {
 	
 	
 	function get() {
-
-		// this module is deprecated
-		return;
 	
 		if(argc() > 2 && argv(1) == 'ical') {
 			$event_id = argv(2);
@@ -668,10 +662,9 @@ class Events extends \Zotlabs\Web\Controller {
 						'html'=>$html,
 						'plink' => array($rr['plink'],t('Link to Source'),'',''),
 					);
-
 				}
 			}
-
+			
 			if($export) {
 				header('Content-type: text/calendar');
 				header('content-disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"' );

Zotlabs/Module/Getfile.php

@@ -1,8 +1,6 @@
 <?php
 namespace Zotlabs\Module;
 
-use Zotlabs\Web\HTTPSig;
-
 /**
  * module: getfile
  * 
@@ -37,6 +35,7 @@ class Getfile extends \Zotlabs\Web\Controller {
 		$sig      = $_POST['signature'];
 		$resource = $_POST['resource'];
 		$revision = intval($_POST['revision']);
+		$resolution = (-1);
 
 		if(! $hash)
 			killme();
@@ -48,7 +47,7 @@ class Getfile extends \Zotlabs\Web\Controller {
 					continue;
 				}
 
-				$sigblock = HTTPSig::parse_sigheader($_SERVER[$head]);
+				$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
 				if($sigblock) {
 					$keyId = $sigblock['keyId'];
 
@@ -59,7 +58,7 @@ class Getfile extends \Zotlabs\Web\Controller {
 						);
 						if($r) {
 							$hubloc = $r[0];
-							$verified = HTTPSig::verify('',$hubloc['xchan_pubkey']);	
+							$verified = \Zotlabs\Web\HTTPSig::verify('',$hubloc['xchan_pubkey']);	
 							if($verified && $verified['header_signed'] && $verified['header_valid'] && $hash == $hubloc['hubloc_hash']) {
 								$header_verified = true;
 							}
@@ -82,14 +81,9 @@ class Getfile extends \Zotlabs\Web\Controller {
 			killme();
 		}
 	
-		if(isset($_POST['resolution']))
-			$resolution = intval($_POST['resolution']);
-		elseif(substr($resource,-2,1) == '-') {
+		if(substr($resource,-2,1) == '-') {
 			$resolution = intval(substr($resource,-1,1));
 			$resource = substr($resource,0,-2);
-		}
-		else {
-			$resolution = (-1);
 		}			
 
 		$slop = intval(get_pconfig($channel['channel_id'],'system','getfile_time_slop'));
@@ -112,10 +106,9 @@ class Getfile extends \Zotlabs\Web\Controller {
 		}
 
 		if($resolution > 0) {
-			$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale = %d LIMIT 1",
+			$r = q("select * from photo where resource_id = '%s' and uid = %d limit 1",
 				dbesc($resource),
-				intval($channel['channel_id']),
-				$resolution
+				intval($channel['channel_id'])
 			);
 			if($r) {
 				header('Content-type: ' . $r[0]['mimetype']);

Zotlabs/Module/Group.php

@@ -177,7 +177,7 @@ class Group extends Controller {
 				if($r) 
 					$result = group_rmv(local_channel(),$r[0]['gname']);
 				if($result) {
-					$hookinfo = [ 'pgrp_extras' => '', 'group' => argv(2) ];
+					$hookinfo = [ 'pgrp_extras' => '', 'group'=>$argv(2) ];
 					call_hooks ('privacygroup_extras_drop',$hookinfo);
 					info( t('Privacy group removed.') . EOL);
 				}

Zotlabs/Module/Help.php

@@ -66,10 +66,7 @@ class Help extends \Zotlabs\Web\Controller {
 				case IMAGETYPE_PNG:
 					header("Content-Type: image/png");
 					break;
-				case IMAGETYPE_WEBP:
-					header("Content-Type: image/webp");
-					break;
-				default:
+			   default:
 					break;
 			}
 			header("Content-Length: " . filesize($realpath));

Zotlabs/Module/Hq.php

@@ -152,8 +152,8 @@ class Hq extends \Zotlabs\Web\Controller {
 
 			if($target_item) {
 				// if the target item is not a post (eg a like) we want to address its thread parent
-				//$mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
-				$mid = $target_item['mid'];
+				$mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']);
+
 				// if we got a decoded hash we must encode it again before handing to javascript 
 				if($decoded)
 					$mid = 'b64.' . base64url_encode($mid);
@@ -179,7 +179,6 @@ class Hq extends \Zotlabs\Web\Controller {
 				'$conv'    => '0',
 				'$spam'    => '0',
 				'$fh'      => '0',
-				'$dm'      => '0',
 				'$nouveau' => '0',
 				'$wall'    => '0',
 				'$static'  => $static,

Zotlabs/Module/Id.php

@@ -12,7 +12,7 @@ namespace Zotlabs\Module;
 use Zotlabs\Lib\Activity;
 use Zotlabs\Lib\ActivityStreams;
 use Zotlabs\Lib\LDSignatures;
-use Zotlabs\Web\HTTPSig;
+use Zotlabs\Zot6\HTTPSig;
 use Zotlabs\Web\Controller;
 use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\ThreadListener;

Zotlabs/Module/Import.php

@@ -280,9 +280,8 @@ class Import extends \Zotlabs\Web\Controller {
 
 			// replace any existing xchan we may have on this site if we're seizing control
 
-			$r = q("delete from xchan where ( xchan_hash = '%s' or xchan_hash = '%s' ) ",
-				dbesc($channel['channel_hash']),
-				dbesc($channel['channel_portable_id'])
+			$r = q("delete from xchan where xchan_hash = '%s'",
+				dbesc($channel['channel_hash'])
 			);
 
 			$r = xchan_store_lowlevel(
@@ -304,30 +303,6 @@ class Import extends \Zotlabs\Web\Controller {
 					'xchan_name_date'      => datetime_convert()
 				]
 			);
-
-			if($channel['channel_portable_id']) {
-				$r = xchan_store_lowlevel(
-					[
-						'xchan_hash'           => \Zotlabs\Lib\Libzot::make_xchan_hash($channel['channel_guid'],$channel['channel_pubkey']),
-						'xchan_guid'           => $channel['channel_guid'],
-						'xchan_guid_sig'       => 'sha256.' . $channel['channel_guid_sig'],
-						'xchan_pubkey'         => $channel['channel_pubkey'],
-						'xchan_photo_l'        => z_root() . "/photo/profile/l/" . $channel['channel_id'],
-						'xchan_photo_m'        => z_root() . "/photo/profile/m/" . $channel['channel_id'],
-						'xchan_photo_s'        => z_root() . "/photo/profile/s/" . $channel['channel_id'],
-						'xchan_addr'           => channel_reddress($channel),
-						'xchan_url'            => z_root() . '/channel/' . $channel['channel_address'],
-						'xchan_connurl'        => z_root() . '/poco/' . $channel['channel_address'],
-						'xchan_follow'         => z_root() . '/follow?f=&url=%s',
-						'xchan_name'           => $channel['channel_name'],
-						'xchan_network'        => 'zot6',
-						'xchan_photo_date'     => datetime_convert(),
-						'xchan_name_date'      => datetime_convert()
-					]
-				);
-			}
-
-
 		}
 
 		logger('import step 6');
@@ -337,20 +312,10 @@ class Import extends \Zotlabs\Web\Controller {
 		if($xchans) {
 			foreach($xchans as $xchan) {
 
-				if($xchan['xchan_network'] === 'zot') {
-					$hash = make_xchan_hash($xchan['xchan_guid'],$xchan['xchan_guid_sig']);
-					if($hash !== $xchan['xchan_hash']) {
-						logger('forged xchan: ' . print_r($xchan,true));
-						continue;
-					}
-				}
-
-				if($xchan['xchan_network'] === 'zot6') {
-					$zhash = \Zotlabs\Lib\Libzot::make_xchan_hash($xchan['xchan_guid'],$xchan['xchan_pubkey']);
-					if($zhash !== $xchan['xchan_hash']) {
-						logger('forged xchan: ' . print_r($xchan,true));
-						continue;
-					}
+				$hash = make_xchan_hash($xchan['xchan_guid'],$xchan['xchan_guid_sig']);
+				if($xchan['xchan_network'] === 'zot' && $hash !== $xchan['xchan_hash']) {
+					logger('forged xchan: ' . print_r($xchan,true));
+					continue;
 				}
 
 				if(! array_key_exists('xchan_hidden',$xchan)) {

Zotlabs/Module/Item.php

@@ -9,7 +9,7 @@ use Zotlabs\Daemon\Master;
 use Zotlabs\Lib\Activity;
 use Zotlabs\Lib\ActivityStreams;
 use Zotlabs\Lib\LDSignatures;
-use Zotlabs\Web\HTTPSig;
+use Zotlabs\Zot6\HTTPSig;
 use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\ThreadListener;
 use App;
@@ -42,6 +42,8 @@ class Item extends Controller {
 
 		if (Libzot::is_zot_request()) {
 
+			$conversation = false;
+
 			$item_id = argv(1);
 
 			if (! $item_id)
@@ -94,12 +96,11 @@ class Item extends Controller {
 			}
 
 			// if we don't have a parent id belonging to the signer see if we can obtain one as a visitor that we have permission to access
-			// with a bias towards those items owned by channels on this site (item_wall = 1)
 
 			$sql_extra = item_permissions_sql(0);
 
 			if (! $i) {
-				$i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra order by item_wall desc limit 1",
+				$i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra limit 1",
 					dbesc($r[0]['parent_mid'])
 				);
 			}
@@ -191,25 +192,6 @@ class Item extends Controller {
 			killme();
 
 		}
-
-		if(argc() > 1 && argv(1) !== 'drop') {
-			$x = q("select uid, item_wall, llink, mid from item where mid = '%s' ",
-				dbesc(z_root() . '/item/' . argv(1))
-			);
-			if($x) {
-				foreach($x as $xv) {
-					if (intval($xv['item_wall'])) {
-						$c = channelx_by_n($xv['uid']);
-						if ($c) {
-							goaway($c['xchan_url'] . '?mid=' . gen_link_id($xv['mid']));
-						}
-					}
-				}
-				goaway($x[0]['llink']);
-			}
-			http_status_exit(404, 'Not found');
-		}
-
 	}
 
 
@@ -271,9 +253,7 @@ class Item extends Controller {
 	
 		$consensus = intval($_REQUEST['consensus']);
 		$nocomment = intval($_REQUEST['nocomment']);
-
-		$is_poll = ((trim($_REQUEST['poll_answers'][0]) != '' && trim($_REQUEST['poll_answers'][1]) != '') ? true : false);
-
+	
 		// 'origin' (if non-zero) indicates that this network is where the message originated,
 		// for the purpose of relaying comments to other conversation members. 
 		// If using the API from a device (leaf node) you must set origin to 1 (default) or leave unset.
@@ -570,10 +550,10 @@ class Item extends Controller {
 				$public_policy     = $orig_post['public_policy'];
 				$private           = $orig_post['item_private'];
 			}
-
-			if($public_policy || $acl->is_private()) {
-				$private = (($private) ? $private : 1);
-			}  
+	
+			if($private || $public_policy || $acl->is_private())
+				$private = 1;
+	
 	
 			$location          = $orig_post['location'];
 			$coord             = $orig_post['coord'];
@@ -650,11 +630,12 @@ class Item extends Controller {
 
 			$allow_empty       = ((array_key_exists('allow_empty',$_REQUEST)) ? intval($_REQUEST['allow_empty']) : 0);	
 
-			$private = (($private) ? $private : intval($acl->is_private() || ($public_policy)));
+			$private = intval($acl->is_private() || ($public_policy));
 	
 			// If this is a comment, set the permissions from the parent.
 	
 			if($parent_item) {
+				$private = 0;
 				$acl->set($parent_item);
 				$private = intval($acl->is_private() || $parent_item['item_private']);
 				$public_policy     = $parent_item['public_policy'];
@@ -720,6 +701,7 @@ class Item extends Controller {
 			// BBCODE alert: the following functions assume bbcode input
 			// and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.)
 			// we may need virtual or template classes to implement the possible alternatives
+			
 
 			if(strpos($body,'[/summary]') !== false) {
                 $match = '';
@@ -759,12 +741,7 @@ class Item extends Controller {
 					}
 				}
 			}
-
-			if(($str_contact_allow) && (! $str_group_allow)) {
-				// direct message - private between individual channels but not groups
-				$private = 2;
-			}
-
+	
 	
 			/**
 			 *
@@ -816,6 +793,11 @@ class Item extends Controller {
 							'revision' => $r['data']['revision']
 						);
 					}
+					$ext = substr($r['data']['filename'],strrpos($r['data']['filename'],'.'));
+					if(strpos($r['data']['filetype'],'audio/') !== false)
+						$attach_link =  '[audio]' . z_root() . '/attach/' . $r['data']['hash'] . '/' . $r['data']['revision'] . (($ext) ? $ext : '') . '[/audio]';
+					elseif(strpos($r['data']['filetype'],'video/') !== false)
+						$attach_link =  '[video]' . z_root() . '/attach/' . $r['data']['hash'] . '/' . $r['data']['revision'] . (($ext) ? $ext : '') . '[/video]';
 					$body = str_replace($match[1][$i],$attach_link,$body);
 					$i++;
 				}
@@ -923,27 +905,6 @@ class Item extends Controller {
 		}
 
 
-		if($is_poll) {
-			$poll = [
-				'question' => $body,
-				'answers' => $_REQUEST['poll_answers'],
-				'multiple_answers' => $_REQUEST['poll_multiple_answers'],
-				'expire_value' => $_REQUEST['poll_expire_value'],
-				'expire_unit' => $_REQUEST['poll_expire_unit']
-			];
-			$obj = $this->extract_poll_data($poll, [ 'item_private' => $private, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_contact_deny ]);
-		}
-		else {
-			$obj = $this->extract_bb_poll_data($body,[ 'item_private' => $private, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_contact_deny ]);
-		}
-
-		if ($obj) {
-			$obj['url'] = $mid;
-			$obj['attributedTo'] = channel_url($channel);
-			$datarray['obj'] = $obj;
-			$obj_type = 'Question';
-		}
-
 		if(! $parent_mid) {
 			$parent_mid = $mid;
 		}
@@ -992,11 +953,7 @@ class Item extends Controller {
 			$plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . gen_link_id($mid);
 			$plink = substr($plink,0,190);
 		}
-
-		if ($datarray['obj']) {
-			$datarray['obj']['id'] = $mid;
-		}
-
+		
 		$datarray['aid']                 = $channel['channel_account_id'];
 		$datarray['uid']                 = $profile_uid;
 		$datarray['uuid']                = $uuid;
@@ -1251,7 +1208,13 @@ class Item extends Controller {
 			killme();
 		}
 		
-		if(($parent == $post_id) || ($datarray['item_private'] == 1)) {
+		if(($parent) && ($parent != $post_id)) {
+			// Store the comment signature information in case we need to relay to Diaspora
+			//$ditem = $datarray;
+			//$ditem['author'] = $observer;
+			//store_diaspora_comment_sig($ditem,$channel,$parent_item, $post_id, (($walltowall_comment) ? 1 : 0));
+		}
+		else {
 			$r = q("select * from item where id = %d",
 				intval($post_id)
 			);
@@ -1413,104 +1376,5 @@ class Item extends Controller {
 		return $ret;
 	}
 	
-	function extract_bb_poll_data(&$body,$item) {
-
-		$multiple = false;
-
-		if (strpos($body,'[/question]') === false && strpos($body,'[/answer]') === false) {
-			return false;
-		}
-		if (strpos($body,'[nobb]') !== false) {
-			return false;
-		}
-
-
-		$obj = [];
-		$ptr = [];
-		$matches = null;
-		$obj['type'] = 'Question';
-
-		if (preg_match_all('/\[answer\](.*?)\[\/answer\]/ism',$body,$matches,PREG_SET_ORDER)) {
-			foreach ($matches as $match) {
-				$ptr[] = [ 'name' => $match[1], 'type' => 'Note', 'replies' => [ 'type' => 'Collection', 'totalItems' => 0 ]];
-				$body = str_replace('[answer]' . $match[1] . '[/answer]', EMPTY_STR, $body);
-			}
-		}
-
-		$matches = null;
-
-		if (preg_match('/\[question\](.*?)\[\/question\]/ism',$body,$matches)) {
-			$obj['content'] = bbcode($matches[1]);
-			$body = str_replace('[question]' . $matches[1] . '[/question]', $matches[1], $body);
-			$obj['oneOf'] = $ptr;
-		}
-
-		$matches = null;
-		
-		if (preg_match('/\[question=multiple\](.*?)\[\/question\]/ism',$body,$matches)) {
-			$obj['content'] = bbcode($matches[1]);
-			$body = str_replace('[question=multiple]' . $matches[1] . '[/question]', $matches[1], $body);
-			$obj['anyOf'] = $ptr;
-		}
-
-		$matches = null;
-		
-		if (preg_match('/\[ends\](.*?)\[\/ends\]/ism',$body,$matches)) {
-			$obj['endTime'] = datetime_convert(date_default_timezone_get(),'UTC', $matches[1],ATOM_TIME);
-			$body = str_replace('[ends]' . $matches[1] . '[/ends]', EMPTY_STR, $body);
-		}
-
-
-		if ($item['item_private']) {
-			$obj['to'] = Activity::map_acl($item);
-		}
-		else {
-			$obj['to'] = [ ACTIVITY_PUBLIC_INBOX ];
-		}
-
-		return $obj;
-
-	}
-
-
-	function extract_poll_data($poll, $item) {
-
-		$multiple = intval($poll['multiple_answers']);
-		$expire_value = intval($poll['expire_value']);
-		$expire_unit = $poll['expire_unit'];
-		$question = $poll['question'];
-		$answers = $poll['answers'];
-
-		$obj = [];
-		$ptr = [];
-		$obj['type'] = 'Question';
-		$obj['content'] = bbcode($question);
-
-		foreach($answers as $answer) {
-			if(trim($answer))
-				$ptr[] = [ 'name' => escape_tags($answer), 'type' => 'Note', 'replies' => [ 'type' => 'Collection', 'totalItems' => 0 ]];
-		}
-
-		if($multiple) {
-			$obj['anyOf'] = $ptr;
-		}
-		else {
-			$obj['oneOf'] = $ptr;
-		}
-
-		$obj['endTime'] = datetime_convert(date_default_timezone_get(), 'UTC', 'now + ' . $expire_value . ' ' . $expire_unit, ATOM_TIME);
-
-		if ($item['item_private']) {
-			$obj['to'] = Activity::map_acl($item);
-		}
-		else {
-			$obj['to'] = [ ACTIVITY_PUBLIC_INBOX ];
-		}
-
-		return $obj;
-
-	}
-
-
-
+	
 }

Zotlabs/Module/Like.php

@@ -75,12 +75,7 @@ class Like extends \Zotlabs\Web\Controller {
 			return EMPTY_STR; 
 		}
 
-		$is_rsvp = false;
-		if (in_array($activity, [ ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE ])) {
-			$is_rsvp = true;
-		}
-
-
+	
 		$extended_like = false;
 		$object = $target = null;
 		$post_type = EMPTY_STR;
@@ -386,7 +381,7 @@ class Like extends \Zotlabs\Web\Controller {
 		$arr = array();
 	
 		$arr['uuid']  = $uuid;
-		$arr['mid'] = z_root() . (($is_rsvp) ? '/activity/' : '/item/') . $uuid;
+		$arr['mid'] = z_root() . '/item/' . $uuid;
 
 		if($extended_like) {
 			$arr['item_thread_top'] = 1;
@@ -496,7 +491,7 @@ class Like extends \Zotlabs\Web\Controller {
 
 		$arr['item_flags']   = $item_flags;
 		$arr['item_wall']    = $item_wall;
-		$arr['parent_mid']   = (($extended_like) ? $arr['mid'] : $item['mid']);
+		$arr['parent_mid']   = (($extended_like) ? $mid : $item['mid']);
 		$arr['owner_xchan']  = (($extended_like) ? $ch[0]['xchan_hash'] : $thread_owner['xchan_hash']);
 		$arr['author_xchan'] = $observer['xchan_hash'];
 	
@@ -551,7 +546,7 @@ class Like extends \Zotlabs\Web\Controller {
 				dbesc($observer['xchan_hash']),
 				dbesc($ch[0]['channel_hash']),
 				intval($post_id),
-				dbesc($arr['mid']),
+				dbesc($mid),
 				dbesc($activity),
 				dbesc(($tgttype)? $tgttype : $objtype),
 				dbesc($obj_id),
@@ -560,7 +555,7 @@ class Like extends \Zotlabs\Web\Controller {
 			$r = q("select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ",
 				dbesc($observer['xchan_hash']),
 				dbesc($ch[0]['channel_hash']),
-				dbesc($arr['mid']),
+				dbesc($mid),
 				dbesc($activity),
 				dbesc(($tgttype)? $tgttype : $objtype),
 				dbesc($obj_id)

Zotlabs/Module/Linkinfo.php

@@ -2,6 +2,9 @@
 namespace Zotlabs\Module;
 
 
+
+
+
 class Linkinfo extends \Zotlabs\Web\Controller {
 
 	function get() {
@@ -45,22 +48,7 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 		}
 	
 		logger('linkinfo: ' . $url);
-		
-                // Replace plink URL with 'share' tag if possible
-                preg_match("/(mid=b64\.|display\/|posts\/)([\w\-]+)(&.+)?$/", $url, $mid);
-
-                if (!empty($mid) && $mid[1] == 'mid=b64.')
-                        $mid[2] = base64_decode($mid[2]);
-
-                $r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d AND item_private = 0 LIMIT 1",
-                        dbesc((empty($mid) ? $url : $mid[2])),
-                        intval(local_channel())
-                );
-                if ($r) {
-                        echo "[share=" . $r[0]['id'] . "][/share]";
-                        killme();
-                }
-
+	
 		$result = z_fetch_url($url,false,0,array('novalidate' => true, 'nobody' => true));
 		if($result['success']) {
 			$hdrs=array();
@@ -81,14 +69,6 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 					killme();
 				}
 				if(stripos($type,'video/') !== false) {
-					$thumb = self::get_video_poster($url);
-					if($thumb) {
-						if ($zrl)
-							echo $br . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . $br;
-						else
-							echo $br . '[video poster=\'' . $thumb . '\']' . $url . '[/video]' . $br;
-						killme();
-					}
 					if($zrl)
 						echo $br . '[zvideo]' . $url . '[/zvideo]' . $br;
 					else
@@ -236,42 +216,7 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 	
 	        return($complete);
 	}
-
-	public static function get_video_poster($url) {
-
-		if(strpos($url,z_root() . '/cloud/') === false) {
-			return EMPTY_STR;
-		}
-		$m = parse_url($url,PHP_URL_PATH);
-		if($m) {
-			// strip leading '/cloud/'
-			$m = substr($m,7);
-		}
-		$nick = substr($m,0,strpos($m,'/'));
-		$p = substr($m,strpos($m,'/')+1);
-
-		// get the channel to check permissions
-		
-		$u = channelx_by_nick($nick);
-
-		if($u && $p) {
-
-			$sql_extra = permissions_sql(intval($u['channel_id']));
-
-			$r = q("select hash, content from attach where display_path = '%s' and uid = %d and os_storage = 1 $sql_extra limit 1",
-				dbesc($p),
-				intval($u['channel_id'])
-			);
-			if($r) {
-				$path = dbunescbin($r[0]['content']);
-				if($path && @file_exists($path . '.thumb')) {
-					return z_root() . '/poster/' . $nick . '/' . $r[0]['hash'];
-				}
-			}
-		}
-		return EMPTY_STR;
-	}
-
+	
 	
 	public static function parseurl_getsiteinfo($url) {
 		$siteinfo = array();
@@ -287,7 +232,7 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 		// Check codepage in HTTP headers or HTML if not exist
 		$cp = (preg_match('/Content-Type: text\/html; charset=(.+)\r\n/i', $header, $o) ? $o[1] : '');
 		if(empty($cp))
-		    $cp = (preg_match('/meta.+content=["\']text\/html; charset=([^"\']+)/i', $body, $o) ? $o[1] : 'AUTO');
+		    $cp = (preg_match('/meta.+content=["|\']text\/html; charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'AUTO');
 
 		$body   = mb_convert_encoding($body, 'UTF-8', $cp);
 		$body   = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
@@ -456,9 +401,8 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 	
 				while (strpos($text, "  "))
 					$text = trim(str_replace("  ", " ", $text));
-					
-				$text = substr(html_entity_decode($text, ENT_QUOTES, "UTF-8"), 0, 350);
-				$siteinfo["text"] = rtrim(substr($text, 0, strrpos($text, " ")), "?.,:;!-") . '...';
+	
+				$siteinfo["text"] = html_entity_decode(substr($text,0,350), ENT_QUOTES, "UTF-8").'...';
 			}
 		}
 	

Zotlabs/Module/Lockview.php

@@ -76,7 +76,7 @@ class Lockview extends \Zotlabs\Web\Controller {
 			killme();
 		}
 	
-		if(intval($item['item_private']) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) 
+		if(($item['item_private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) 
 			&& (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) {
 	
 			// if the post is private, but public_policy is blank ("visible to the internet"), and there aren't any

Zotlabs/Module/Magic.php

@@ -1,8 +1,6 @@
 <?php
 namespace Zotlabs\Module;
 
-use Zotlabs\Web\HTTPSig;
-
 @require_once('include/zot.php');
 
 
@@ -154,9 +152,10 @@ class Magic extends \Zotlabs\Web\Controller {
 				$headers['Accept'] = 'application/x-zot+json' ;
 				$headers['X-Open-Web-Auth'] = random_string();
 				$headers['Host'] = $parsed['host'];
-				$headers['Digest'] = HTTPSig::generate_digest_header($data);
+				$headers['Digest'] = 'SHA-256=' . \Zotlabs\Web\HTTPSig::generate_digest($data,false);
 
-				$headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], 'acct:' . channel_reddress($channel),true,'sha512');
+				$headers = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'],
+					'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false,true,'sha512');
 				$x = z_post_url($basepath . '/owa',$data,$redirects,[ 'headers' => $headers ]);
 
 				if($x['success']) {
@@ -170,8 +169,8 @@ class Magic extends \Zotlabs\Web\Controller {
 							$token = $j['token'];
 						}
 						
-						$strp = strpbrk($dest,'?&');
-						$args = (($strp) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : '');
+						$x = strpbrk($dest,'?&');
+						$args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : '');
 						goaway($dest . $args);
 					}
 				}

Zotlabs/Module/Mail.php

@@ -0,0 +1,444 @@
+<?php
+namespace Zotlabs\Module;
+
+require_once('include/acl_selectors.php');
+require_once('include/message.php');
+require_once('include/zot.php');
+require_once("include/bbcode.php");
+
+
+
+
+class Mail extends \Zotlabs\Web\Controller {
+
+	function post() {
+	
+		if(! local_channel())
+			return;
+	
+		$replyto   = ((x($_REQUEST,'replyto'))      ? notags(trim($_REQUEST['replyto']))      : '');
+		$subject   = ((x($_REQUEST,'subject'))      ? notags(trim($_REQUEST['subject']))      : '');
+		$body      = ((x($_REQUEST,'body'))         ? escape_tags(trim($_REQUEST['body']))    : '');
+		$recipient = ((x($_REQUEST,'messageto'))    ? notags(trim(urldecode($_REQUEST['messageto'])))    : '');
+		$rstr      = ((x($_REQUEST,'messagerecip')) ? notags(trim($_REQUEST['messagerecip'])) : '');
+		$preview   = ((x($_REQUEST,'preview'))      ? intval($_REQUEST['preview'])            : 0);
+		$expires   = ((x($_REQUEST,'expires'))      ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE);
+		$raw       = ((x($_REQUEST,'raw'))          ? intval($_REQUEST['raw'])                : 0);
+		$mimetype  = ((x($_REQUEST,'mimetype'))     ? notags(trim($_REQUEST['mimetype']))     : 'text/bbcode');
+
+		if($preview) {
+
+			if($raw) {
+				$body = mail_prepare_binary(['id' => 'M0']);
+				echo json_encode(['preview' => $body]);
+			}
+			else {
+				$body = cleanup_bbcode($body);
+				$results = linkify_tags($body, local_channel());
+
+				if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) {
+					$attachments = array();
+					foreach($match[2] as $mtch) {
+						$hash = substr($mtch,0,strpos($mtch,','));
+						$rev = intval(substr($mtch,strpos($mtch,',')));
+						$r = attach_by_hash_nodata($hash,get_observer_hash(),$rev);
+						if($r['success']) {
+							$attachments[] = array(
+								'href'     => z_root() . '/attach/' . $r['data']['hash'],
+								'length'   =>  $r['data']['filesize'],
+								'type'     => $r['data']['filetype'],
+								'title'    => urlencode($r['data']['filename']),
+								'revision' => $r['data']['revision']
+							);
+						}
+						$body = trim(str_replace($match[1],'',$body));
+					}
+				}
+				echo json_encode(['preview' => zidify_links(smilies(bbcode($body)))]);
+			}
+			killme();
+		} 
+
+		// If we have a raw string for a recipient which hasn't been auto-filled,
+		// it means they probably aren't in our address book, hence we don't know
+		// if we have permission to send them private messages.
+		// finger them and find out before we try and send it.
+	
+		if(! $recipient) {
+			$channel = \App::get_channel();
+	
+			$j = \Zotlabs\Zot\Finger::run(punify($rstr),$channel);
+	
+			if(! $j['success']) {
+				notice( t('Unable to lookup recipient.') . EOL);
+				return;
+			} 
+	
+			logger('message_post: lookup: ' . $rstr . ' ' . print_r($j,true));
+	
+			if(! $j['guid']) {
+				notice( t('Unable to communicate with requested channel.'));
+				return;
+			}
+	
+			$x = import_xchan($j);
+	
+			if(! $x['success']) {
+				notice( t('Cannot verify requested channel.'));
+				return;
+			}
+	
+			$recipient = $x['hash'];
+	
+			$their_perms = 0;
+	
+			if($j['permissions']['data']) {
+				$permissions = crypto_unencapsulate($j['permissions'],$channel['channel_prvkey']);
+				if($permissions)
+					$permissions = json_decode($permissions, true);
+				logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA);
+			}
+			else
+				$permissions = $j['permissions'];
+	
+			if(! ($permissions['post_mail'])) {
+	 			notice( t('Selected channel has private message restrictions. Send failed.'));
+				// reported issue: let's still save the message and continue. We'll just tell them
+				// that nothing useful is likely to happen. They might have spent hours on it.  
+				//			return;
+	
+			}
+		}
+	
+		require_once('include/text.php');
+		linkify_tags($body, local_channel());
+	
+
+		if(! $recipient) {
+			notice('No recipient found.');
+			\App::$argc = 2;
+			\App::$argv[1] = 'new';
+			return;
+		}
+	
+		// We have a local_channel, let send_message use the session channel and save a lookup
+		
+		$ret = send_message(0, $recipient, $body, $subject, $replyto, $expires, $mimetype, $raw);
+
+		if($ret['success']) {
+			xchan_mail_query($ret['mail']);
+			build_sync_packet(0,array('conv' => array($ret['conv']),'mail' => array(encode_mail($ret['mail'],true))));
+		}
+		else {
+			notice($ret['message']);
+		}
+	
+		goaway(z_root() . '/mail/combined');
+			
+	}
+	
+	function get() {
+	
+		$o = '';
+		nav_set_selected('Mail');
+	
+		if(! local_channel()) {
+			notice( t('Permission denied.') . EOL);
+			return login();
+		}
+	
+		$channel = \App::get_channel();
+	
+		head_set_icon($channel['xchan_photo_s']);
+	
+		$cipher = get_pconfig(local_channel(),'system','default_cipher');
+		if(! $cipher)
+			$cipher = 'aes256';
+	
+		$tpl = get_markup_template('mail_head.tpl');
+		$header = replace_macros($tpl, array(
+			'$header' => t('Messages'),
+		));
+	
+		if(argc() == 3 && intval(argv(1)) && argv(2) === 'download') {
+
+			$r = q("select * from mail where id = %d and channel_id = %d",
+				intval(argv(1)),
+				intval(local_channel())
+			);
+
+			if($r) {
+
+				header('Content-type: ' . $r[0]['mail_mimetype']);
+				header('Content-disposition: attachment; filename="' . t('message') . '-' . $r[0]['id'] . '"' );
+				$body = (($r[0]['mail_obscured']) ? base64url_decode(str_rot47($r[0]['body'])) : $r[0]['body']);				
+				echo $body;
+				killme();
+			}
+
+		}
+
+
+		if((argc() == 4) && (argv(2) === 'drop')) {
+			if(! intval(argv(3)))
+				return;
+			$cmd = argv(2);
+			$mailbox = argv(1);
+			$r = private_messages_drop(local_channel(), argv(3));
+			if($r) {
+				//info( t('Message deleted.') . EOL );
+			}
+			goaway(z_root() . '/mail/' . $mailbox);
+		}
+	
+		if((argc() == 4) && (argv(2) === 'recall')) {
+			if(! intval(argv(3)))
+				return;
+			$cmd = argv(2);
+			$mailbox = argv(1);
+			$r = q("update mail set mail_recalled = 1 where id = %d and channel_id = %d",
+				intval(argv(3)),
+				intval(local_channel())
+			);
+			$x = q("select * from mail where id = %d and channel_id = %d",
+				intval(argv(3)),
+				intval(local_channel())
+			);
+			if($x) {
+				build_sync_packet(local_channel(),array('mail' => encode_mail($x[0],true)));
+			}
+	
+			\Zotlabs\Daemon\Master::Summon(array('Notifier','mail',intval(argv(3))));
+	
+			if($r) {
+					info( t('Message recalled.') . EOL );
+			}
+			goaway(z_root() . '/mail/' . $mailbox . '/' . argv(3));
+	
+		}
+	
+		if((argc() == 4) && (argv(2) === 'dropconv')) {
+			if(! intval(argv(3)))
+				return;
+			$cmd = argv(2);
+			$mailbox = argv(1);
+			$r = private_messages_drop(local_channel(), argv(3), true);
+			if($r)
+				info( t('Conversation removed.') . EOL );
+			goaway(z_root() . '/mail/' . $mailbox);
+		}
+	
+		if((argc() > 1) && (argv(1) === 'new')) {
+			
+			$plaintext = true;
+	
+			$tpl = get_markup_template('msg-header.tpl');
+	
+			$header = replace_macros($tpl, array(
+				'$baseurl' => z_root(),
+				'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+				'$nickname' => $channel['channel_address'],
+				'$linkurl' => t('Please enter a link URL:'),
+				'$expireswhen' => t('Expires YYYY-MM-DD HH:MM')
+			));
+	
+			\App::$page['htmlhead'] .= $header;
+	
+			$prename = '';
+			$preid = '';
+	
+			if(x($_REQUEST,'hash')) {
+	
+				$r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash
+					where abook_channel = %d and abook_xchan = '%s' limit 1",
+					intval(local_channel()),
+					dbesc($_REQUEST['hash'])
+				);
+	
+				if(!$r) {
+					$r = q("select * from xchan where xchan_hash = '%s' and xchan_network = 'zot' limit 1",
+						dbesc($_REQUEST['hash'])
+					);
+				}
+	
+				if($r) {
+					$prename = (($r[0]['abook_id']) ? $r[0]['xchan_name'] : $r[0]['xchan_addr']);
+					$preurl = $r[0]['xchan_url'];
+					$preid = (($r[0]['abook_id']) ? ($r[0]['xchan_hash']) : '');
+				}
+				else {
+					notice( t('Requested channel is not in this network') . EOL );
+				}
+	
+			}
+	
+			$tpl = get_markup_template('prv_message.tpl');
+			$o .= replace_macros($tpl,array(
+				'$new' => true,
+				'$header' => t('Send Private Message'),
+				'$to' => t('To:'),
+				'$prefill' => $prename,
+				'$preid' => $preid,
+				'$subject' => t('Subject:'),
+				'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+				'$text' => ((x($_REQUEST,'body')) ? htmlspecialchars($_REQUEST['body'], ENT_COMPAT, 'UTF-8') : ''),
+				'$yourmessage' => t('Your message:'),
+				'$parent' => '',
+				'$attach' => t('Attach file'),
+				'$insert' => t('Insert web link'),
+				'$submit' => t('Send'),
+				'$defexpire' => '',
+				'$feature_expire' => ((feature_enabled(local_channel(),'content_expire')) ? true : false),
+				'$expires' => t('Set expiration date'),
+				'$feature_encrypt' => ((feature_enabled(local_channel(),'content_encrypt')) ? true : false),
+				'$encrypt' => t('Encrypt text'),
+				'$cipher' => $cipher,
+			));
+	
+			return $o;
+		}
+
+		$direct_mid = 0;
+
+		switch(argv(1)) {
+			case 'combined':
+				$mailbox = 'combined';
+				break;
+			case 'inbox':
+				$mailbox = 'inbox';
+				break;
+			case 'outbox':
+				$mailbox = 'outbox';
+				break;
+			default:
+				$mailbox = 'combined';
+
+				// notifications direct to mail/nn
+
+				if(intval(argv(1)))
+					$direct_mid = intval(argv(1));
+				break;
+		}
+	
+
+		$last_message = private_messages_list(local_channel(), $mailbox, 0, 1);
+
+		$mid = ((argc() > 2) && (intval(argv(2)))) ? argv(2) : $last_message[0]['id'];
+
+		if($direct_mid)
+			$mid = $direct_mid;
+	
+	
+		$plaintext = true;
+	
+	//	if( local_channel() && feature_enabled(local_channel(),'richtext') )
+	//		$plaintext = false;
+	
+	
+	
+		if($mailbox == 'combined') {
+			$messages = private_messages_fetch_conversation(local_channel(), $mid, true);
+		}
+		else {
+			$messages = private_messages_fetch_message(local_channel(), $mid, true);
+		}
+	
+		if(! $messages) {
+			//info( t('Message not found.') . EOL);
+			return;
+		}
+	
+		if($messages[0]['to_xchan'] === $channel['channel_hash'])
+			\App::$poi = $messages[0]['from'];
+		else
+			\App::$poi = $messages[0]['to'];
+	
+		$tpl = get_markup_template('msg-header.tpl');
+		
+		\App::$page['htmlhead'] .= replace_macros($tpl, array(
+			'$nickname' => $channel['channel_address'],
+			'$baseurl' => z_root(),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+			'$linkurl' => t('Please enter a link URL:'),
+			'$expireswhen' => t('Expires YYYY-MM-DD HH:MM')
+		));
+	
+		$mails = array();
+	
+		$seen = 0;
+		$unknown = false;
+	
+		foreach($messages as $message) {
+	
+			$s = theme_attachments($message);
+
+			if($message['mail_raw'])
+				$message['body'] = mail_prepare_binary([ 'id' => $message['id'] ]);
+			else
+				$message['body'] = zidify_links(smilies(bbcode($message['body'])));
+	
+			$mails[] = array(
+				'mailbox' => $mailbox,
+				'id' => $message['id'],
+				'mid' => $message['mid'],
+				'from_name' => $message['from']['xchan_name'],
+				'from_url' =>  chanlink_hash($message['from_xchan']),
+				'from_photo' => $message['from']['xchan_photo_s'],
+				'to_name' => $message['to']['xchan_name'],
+				'to_url' =>  chanlink_hash($message['to_xchan']),
+				'to_photo' => $message['to']['xchan_photo_s'],
+				'subject' => $message['title'],
+				'body' => $message['body'],
+				'attachments' => $s,
+				'delete' => t('Delete message'),
+				'dreport' => t('Delivery report'),
+				'recall' => t('Recall message'),
+				'can_recall' => ($channel['channel_hash'] == $message['from_xchan']),
+				'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''),
+				'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c'),
+			);
+					
+			$seen = $message['seen'];
+	
+		}
+	
+		$recp = (($message['from_xchan'] === $channel['channel_hash']) ? 'to' : 'from');
+	
+		$tpl = get_markup_template('mail_display.tpl');
+		$o = replace_macros($tpl, array(
+			'$mailbox' => $mailbox,
+			'$prvmsg_header' => $message['title'],
+			'$thread_id' => $mid,
+			'$thread_subject' => $message['title'],
+			'$thread_seen' => $seen,
+			'$delete' =>  t('Delete Conversation'),
+			'$canreply' => (($unknown) ? false : '1'),
+			'$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
+			'$mails' => $mails,
+				
+			// reply
+			'$header' => t('Send Reply'),
+			'$to' => t('To:'),
+			'$reply' => true,
+			'$subject' => t('Subject:'),
+			'$subjtxt' => $message['title'],
+			'$yourmessage' => sprintf(t('Your message for %s (%s):'), $message[$recp]['xchan_name'], $message[$recp]['xchan_addr']),
+			'$text' => '',
+			'$parent' => $message['parent_mid'],
+			'$recphash' => $message[$recp]['xchan_hash'],
+			'$attach' => t('Attach file'),
+			'$insert' => t('Insert web link'),
+			'$submit' => t('Submit'),
+			'$defexpire' => '',
+			'$feature_expire' => ((feature_enabled(local_channel(),'content_expire')) ? true : false),
+			'$expires' => t('Set expiration date'),
+			'$feature_encrypt' => ((feature_enabled(local_channel(),'content_encrypt')) ? true : false),
+			'$encrypt' => t('Encrypt text'),
+			'$cipher' => $cipher,
+		));
+	
+		return $o;
+	
+	}
+	
+}

Zotlabs/Module/Menu.php

@@ -54,10 +54,9 @@ class Menu extends \Zotlabs\Web\Controller {
 		if($_REQUEST['menu_system'])
 			$_REQUEST['menu_flags'] |= MENU_SYSTEM;
 	
-		$menu_id = ((argc() > 2) ? intval(argv(2)) : 0);
-
+		$menu_id = ((argc() > 1) ? intval(argv(1)) : 0);
 		if($menu_id) {
-			$_REQUEST['menu_id'] = $menu_id;
+			$_REQUEST['menu_id'] = intval(argv(1));
 			$r = menu_edit($_REQUEST);
 			if($r) {
 				menu_sync_packet($uid,get_observer_hash(),$menu_id);

Zotlabs/Module/Network.php

@@ -69,7 +69,6 @@ class Network extends \Zotlabs\Web\Controller {
 		$category   = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
 		$hashtags   = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
 		$verb       = ((x($_REQUEST,'verb')) ? $_REQUEST['verb'] : '');
-		$dm         = ((x($_REQUEST,'dm')) ? $_REQUEST['dm'] : 0);
 
 
 		$order = get_pconfig(local_channel(), 'mod_network', 'order', 0);
@@ -340,7 +339,7 @@ class Network extends \Zotlabs\Web\Controller {
 			// The special div is needed for liveUpdate to kick in for this page.
 			// We only launch liveUpdate if you aren't filtering in some incompatible
 			// way and also you aren't writing a comment (discovered in javascript).
-
+	
 			$maxheight = get_pconfig(local_channel(),'system','network_divmore_height');
 			if(! $maxheight)
 				$maxheight = 400;
@@ -364,7 +363,6 @@ class Network extends \Zotlabs\Web\Controller {
 				'$conv'    => (($conv) ? $conv : '0'),
 				'$spam'    => (($spam) ? $spam : '0'),
 				'$fh'      => '0',
-				'$dm'      => (($dm) ? $dm : '0'),
 				'$nouveau' => (($nouveau) ? $nouveau : '0'),
 				'$wall'    => '0',
 				'$static'  => $static, 
@@ -411,33 +409,15 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 		}
 	
-		if ($verb) {
-
-			// the presence of a leading dot in the verb determines
-			// whether to match the type of activity or the child object.
-			// The name 'verb' is a holdover from the earlier XML
-			// ActivityStreams specification.
-
-			if (substr($verb,0,1) === '.') {
-				$verb = substr($verb,1);
-				$sql_extra .= sprintf(" AND item.obj_type like '%s' ",
-					dbesc(protect_sprintf('%' . $verb . '%'))
-				);
-			}
-			else {
-				$sql_extra .= sprintf(" AND item.verb like '%s' ",
-					dbesc(protect_sprintf('%' . $verb . '%'))
-				);
-			}
+		if($verb) {
+			$sql_extra .= sprintf(" AND item.verb like '%s' ",
+				dbesc(protect_sprintf('%' . $verb . '%'))
+			);
 		}
 	
 		if(strlen($file)) {
 			$sql_extra .= term_query('item',$file,TERM_FILE);
 		}
-
-		if ($dm) {
-			$sql_extra .= " AND item_private = 2 ";
-		}
 	
 		if($conv) {
 			$item_thread_top = '';

Zotlabs/Module/Owa.php

@@ -2,8 +2,6 @@
 
 namespace Zotlabs\Module;
 
-use Zotlabs\Web\HTTPSig;
-
 /**
  * OpenWebAuth verifier and token generator
  * See https://macgirvin.com/wiki/mike/OpenWebAuth/Home
@@ -27,34 +25,17 @@ class Owa extends \Zotlabs\Web\Controller {
 					continue;
 				}
 
-				$sigblock = HTTPSig::parse_sigheader($_SERVER[$head]);
+				$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
 				if($sigblock) {
 					$keyId = $sigblock['keyId'];
 
 					if($keyId) {
-
-						// Hubzilla connections can have both zot and zot6 hublocs
-						// The connections will usually be zot so match those first
-						
 						$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash 
-							where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and hubloc_network = 'zot' ",
+							where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) ",
 							dbesc(str_replace('acct:','',$keyId)),
 							dbesc($keyId)
 						);
-
-						// If nothing was found, try searching on any network
-						
-						if (! $r) {
-							$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash 
-								where ( hubloc_addr = '%s' or hubloc_id_url = '%s' )",
-								dbesc(str_replace('acct:','',$keyId)),
-								dbesc($keyId)
-							);
-						}
-
-						// If nothing was found on any network, use network discovery and create a new record
-						
-						if (! $r) {
+						if(! $r) {
 							$found = discover_by_webbie(str_replace('acct:','',$keyId));
 							if($found) {
 								$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash 
@@ -64,16 +45,15 @@ class Owa extends \Zotlabs\Web\Controller {
 								);
 							}
 						}
-						
-						if ($r) {
+						if($r) {
 							foreach($r as $hubloc) {
-								$verified = HTTPSig::verify(file_get_contents('php://input'),$hubloc['xchan_pubkey']);	
+								$verified = \Zotlabs\Web\HTTPSig::verify(file_get_contents('php://input'),$hubloc['xchan_pubkey']);	
 								if($verified && $verified['header_signed'] && $verified['header_valid']) {
 									logger('OWA header: ' . print_r($verified,true),LOGGER_DATA);	
 									logger('OWA success: ' . $hubloc['hubloc_addr'],LOGGER_DATA);
 									$ret['success'] = true;
 									$token = random_string(32);
-									\Zotlabs\Lib\Verify::create('owt',0,$token,$hubloc['hubloc_network'] . ',' . $hubloc['hubloc_addr']);
+									\Zotlabs\Lib\Verify::create('owt',0,$token,$hubloc['hubloc_addr']);
 									$result = '';
 									openssl_public_encrypt($token,$result,$hubloc['xchan_pubkey']);
 									$ret['encrypted_token'] = base64url_encode($result);

Zotlabs/Module/Photo.php

@@ -31,11 +31,16 @@ class Photo extends \Zotlabs\Web\Controller {
 				// NOTREACHED
 		}
 
-		$cache_mode = [ 'on' => false, 'age' => 86400, 'exp' => true, 'leak' => false ];
+		$cache_mode = array(
+			'on' => false,
+			'age' => 86400,
+			'exp' => true,
+			'leak' => false
+		);
 		call_hooks('cache_mode_hook', $cache_mode);
 		
 		$observer_xchan = get_observer_hash();
-		$cachecontrol = '';
+		$ismodified = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
 
 		if(isset($type)) {
 	
@@ -63,6 +68,8 @@ class Photo extends \Zotlabs\Web\Controller {
 				}
 			}
 	
+			$modified = filemtime($default);
+			$default = z_root() . '/' . $default;
 			$uid = $person;
 			
 			$data = '';
@@ -76,7 +83,7 @@ class Photo extends \Zotlabs\Web\Controller {
 			    $modified = strtotime($r[0]['edited'] . "Z");
 			    $mimetype = $r[0]['mimetype'];
 			    if(intval($r[0]['os_storage']))
-			        $data = file_get_contents(dbunescbin($r[0]['content']));
+			        $data = file_get_contents($data);
 			    else
 			        $data = dbunescbin($r[0]['content']);
 			}
@@ -90,17 +97,13 @@ class Photo extends \Zotlabs\Web\Controller {
 			    $default    = $d['default'];
 			    $data       = $d['data'];
 			    $mimetype   = $d['mimetype'];
-			    $modified   = 0;
 			}
 
 			if(! $data) {
-			    $x = z_fetch_url(z_root() . '/' . $default, true, 0, [ 'novalidate' => true ]);
+			    $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]);
 			    $data = ($x['success'] ? $x['body'] : EMPTY_STR);
 			    $mimetype = 'image/png';
-			    $modified = filemtime($default);
 			}
-
-			$cachecontrol = ', must-revalidate';
 		}
 		else {
 	
@@ -139,7 +142,7 @@ class Photo extends \Zotlabs\Web\Controller {
 				    $resolution = 1;
 			}
 			
-			$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
+			$r = q("SELECT uid, photo_usage, display_path FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
 				dbesc($photo),
 				intval($resolution)
 			);
@@ -157,16 +160,18 @@ class Photo extends \Zotlabs\Web\Controller {
 							$allowed = (-1);
 					if($u === PHOTO_CACHE) {
 						// Validate cache
-						if($cache_mode['on']) {
-							$cache = [ 'status' => false, 'item' => $r[0] ];
+						$cache = array(
+							'resid' => $photo,
+							'status' => false
+						);
+						if($cache_mode['on'])
 							call_hooks('cache_url_hook', $cache);
-							if(! $cache['status']) {
-								$url = html_entity_decode($cache['item']['display_path'], ENT_QUOTES);
-								// SSLify if needed
-								if(strpos(z_root(),'https:') !== false && strpos($url,'https:') === false)
-									$url = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($url);
-								goaway($url);
-							}
+						if(! $cache['status']) {
+							$url = htmlspecialchars_decode($r[0]['display_path']);
+							if(strpos(z_root(),'https:') !== false && strpos($url,'https:') === false)
+								$url = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($url);
+							header("Location: " . $url);
+							killme();
 						}
 					}
 				}
@@ -211,23 +216,38 @@ class Photo extends \Zotlabs\Web\Controller {
 				http_status_exit(404,'not found');
 		}
 
- 		if(! $data)
- 			killme();
- 			
- 		$etag = '"' . md5($data . $modified) . '"';
- 		
- 		if($modified == 0)
- 		    $modified = time();
-
 		header_remove('Pragma');
 
-		if((isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] === $etag) || (!isset($_SERVER['HTTP_IF_NONE_MATCH']) && isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $_SERVER['HTTP_IF_MODIFIED_SINCE'] === gmdate("D, d M Y H:i:s", $modified) . " GMT")) {
+        if($ismodified === gmdate("D, d M Y H:i:s", $modified) . " GMT") {
 			header_remove('Expires');
 			header_remove('Cache-Control');
 			header_remove('Set-Cookie');
 			http_status_exit(304,'not modified');
-		}
+        }
 
+		if(! isset($data)) {
+			if(isset($resolution)) {
+				switch($resolution) {
+					case 4:
+						$default = get_default_profile_photo();
+						break;
+					case 5:
+						$default = get_default_profile_photo(80);
+						break;
+					case 6:
+						$default = get_default_profile_photo(48);
+						break;
+					default:
+						killme();
+						// NOTREACHED
+						break;
+				}
+				$x = z_fetch_url(z_root() . '/' . $default,true,0,[ 'novalidate' => true ]);
+				$data = ($x['success'] ? $x['body'] : EMPTY_STR);
+				$mimetype = 'image/png';
+			}
+		}
+	
 		if(isset($res) && intval($res) && $res < 500) {
 			$ph = photo_factory($data, $mimetype);
 			if($ph->is_valid()) {
@@ -264,18 +284,12 @@ class Photo extends \Zotlabs\Web\Controller {
 				$maxage = $expires - time();
 			
 		 	header("Expires: " . gmdate("D, d M Y H:i:s", $expires) . " GMT");
-
-			// set CDN/Infrastructure caching much lower than maxage 
-			// in the event that infrastructure caching is present.
-			$smaxage = intval($maxage/12);
-
-			header("Cache-Control: s-maxage=" . $smaxage . ", max-age=" . $maxage . $cachecontrol);
+			header("Cache-Control: max-age=" . $maxage);
 	
 		}
 
 		header("Content-type: " . $mimetype);
 		header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT");
-		header("ETag: " . $etag);
 		header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data)));
 
 		// If it's a file resource, stream it. 

Zotlabs/Module/Photos.php

@@ -239,53 +239,95 @@ class Photos extends \Zotlabs\Web\Controller {
 					intval($page_owner_uid)
 				);
 				if(count($r)) {
-					
-					$ph = photo_factory(@file_get_contents(dbunescbin($r[0]['content'])), $r[0]['mimetype']);
+					$d = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($r[0]['content'])) : dbunescbin($r[0]['content']));
+					$ph = photo_factory($d, $r[0]['mimetype']);
 					if($ph->is_valid()) {
 						$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
 						$ph->rotate($rotate_deg);
-
-						$edited = datetime_convert();
-
-						q("update attach set filesize = %d, edited = '%s' where hash = '%s' and uid = %d",
-							strlen($ph->imageString()),
-							dbescdate($edited),
+	
+						$width  = $ph->getWidth();
+						$height = $ph->getHeight();
+						
+						if(intval($r[0]['os_storage'])) {
+							@file_put_contents($r[0]['content'],$ph->imageString());
+							$data = $r[0]['content'];
+							$fsize = @filesize($r[0]['content']);
+							q("update attach set filesize = %d where hash = '%s' and uid = %d",
+								intval($fsize),
+								dbesc($resource_id),
+								intval($page_owner_uid)
+							);
+						}
+						else {
+							$data = $ph->imageString();
+							$fsize = strlen($data);
+						}
+	
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 0",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
+							intval($height),
+							intval($width),
 							dbesc($resource_id),
 							intval($page_owner_uid)
 						);
-						
-						$ph->saveImage(dbunescbin($r[0]['content']));
-						
-						$arr = [ 
-							'aid'          => get_account_id(),
-							'uid'          => intval($page_owner_uid), 
-							'resource_id'  => dbesc($resource_id),
-							'filename'     => $r[0]['filename'],
-							'imgscale'	   => 0,
-							'album'        => $r[0]['album'],
-							'os_path'      => $r[0]['os_path'],
-							'os_storage'   => 1,
-							'os_syspath'   => dbunescbin($r[0]['content']),
-							'display_path' => $r[0]['display_path'],
-							'photo_usage'  => PHOTO_NORMAL,
-							'edited'	   => dbescdate($edited)
-						];
-
-						$ph->save($arr);
-
-						unset($arr['os_syspath']);
-
+	
 						if($width > 1024 || $height > 1024) 
 							$ph->scaleImage(1024);
-						$ph->storeThumbnail($arr, PHOTO_RES_1024);
-
+	
+						$width  = $ph->getWidth();
+						$height = $ph->getHeight();
+						$data = $ph->imageString();
+						$fsize = strlen($data);
+	
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 1",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
+							intval($height),
+							intval($width),
+							dbesc($resource_id),
+							intval($page_owner_uid)
+						);
+	
+	
 						if($width > 640 || $height > 640) 
 							$ph->scaleImage(640);
-						$ph->storeThumbnail($arr, PHOTO_RES_640);
-
+	
+						$width  = $ph->getWidth();
+						$height = $ph->getHeight();
+						$data = $ph->imageString();
+						$fsize = strlen($data);
+	
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 2",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
+							intval($height),
+							intval($width),
+							dbesc($resource_id),
+							intval($page_owner_uid)
+						);
+	
+	
 						if($width > 320 || $height > 320) 
 							$ph->scaleImage(320);
-						$ph->storeThumbnail($arr, PHOTO_RES_320);
+	
+						$width  = $ph->getWidth();
+						$height = $ph->getHeight();
+						$data = $ph->imageString();
+						$fsize = strlen($data);
+	
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 3",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
+							intval($height),
+							intval($width),
+							dbesc($resource_id),
+							intval($page_owner_uid)
+						);
 					}
 				}
 			}
@@ -1080,6 +1122,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				$comments = '';
 				if(! $r) {
 					if($observer && ($can_post || $can_comment)) {
+						$feature_auto_save_draft = ((feature_enabled($owner_uid, 'auto_save_draft')) ? "true" : "false");
 						$commentbox = replace_macros($cmnt_tpl,array(
 							'$return_path' => '', 
 							'$mode' => 'photos',
@@ -1095,7 +1138,8 @@ class Photos extends \Zotlabs\Web\Controller {
 							'$submit' => t('Submit'),
 							'$preview' => t('Preview'),
 							'$ww' => '',
-							'$feature_encrypt' => false
+							'$feature_encrypt' => false,
+							'$auto_save_draft' => $feature_auto_save_draft
 						));
 					}
 				}

Zotlabs/Module/Pin.php

@@ -1,69 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-/*
- * Pinned post processing
- */
-
-use App;
-
-class Pin extends \Zotlabs\Web\Controller {
-
-
-	function init() {
-
-		if(argc() !== 2)
-			http_status_exit(400, 'Bad request');
-	}
-
-
-	function post() {
-
-		$item_id = intval($_POST['id']);
-
-		if ($item_id <= 0)
-			http_status_exit(404, 'Not found');
-
-		$observer = \App::get_observer();
-		if(! $observer)
-			http_status_exit(403, 'Forbidden');
-
-		$r = q("SELECT * FROM item WHERE id = %d AND id = parent AND item_private = 0 LIMIT 1",
-			$item_id
-		);
-		if(! $r) {
-			notice(t('Unable to locate original post.'));
-			http_status_exit(404, 'Not found');
-		}
-
-		$midb64 = 'b64.' . base64url_encode($r[0]['mid']);
-		$pinned = (in_array($midb64, get_pconfig($r[0]['uid'], 'pinned', $r[0]['item_type'], [])) ? true : false);
-
-		switch(argv(1)) {
-
-			case 'pin':
-				if(! local_channel() || (local_channel() != $r[0]['uid'] && local_channel() != is_site_admin()))
-					http_status_exit(403, 'Forbidden');
-				// Currently allow only one pinned item for each type
-				set_pconfig($r[0]['uid'], 'pinned', $r[0]['item_type'], ($pinned ? [] : [ $midb64 ]));
-				if($pinned)
-					del_pconfig($r[0]['uid'], 'pinned_hide', $midb64);
-				break;
-
-			case 'hide':
-				if($pinned) {
-					$hidden = get_pconfig($r[0]['uid'], 'pinned_hide', $midb64, []);
-					if(! in_array($observer['xchan_hash'], $hidden)) {
-						$hidden[] = $observer['xchan_hash'];
-						set_pconfig($r[0]['uid'], 'pinned_hide', $midb64, $hidden);
-					}
-				}
-				break;
-
-			default:
-				http_status_exit(404, 'Not found');
-		}
-
-		build_sync_packet($r[0]['uid'], [ 'config' ]);
-	}
-}

Zotlabs/Module/Ping.php

@@ -282,8 +282,8 @@ class Ping extends \Zotlabs\Web\Controller {
 					if(strpos($message, $tt['xname']) === 0)
 						$message = substr($message, strlen($tt['xname']) + 1);
 
+
 					$mid = basename($tt['link']);
-					$mid = ((strpos($mid, 'b64.') === 0) ? @base64url_decode(substr($mid, 4)) : $mid);
 
 					if(in_array($tt['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
 						// we need the thread parent
@@ -291,6 +291,7 @@ class Ping extends \Zotlabs\Web\Controller {
 							dbesc($mid),
 							intval(local_channel())
 						);
+
 						$b64mid = ((strpos($r[0]['thr_parent'], 'b64.') === 0) ? $r[0]['thr_parent'] : 'b64.' . base64url_encode($r[0]['thr_parent']));
 					}
 					else {
@@ -446,7 +447,7 @@ class Ping extends \Zotlabs\Web\Controller {
 					$when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
 
 					$result[] = array(
-						'notify_link' => z_root() . '/cdav/calendar/' . $rr['event_hash'],
+						'notify_link' => z_root() . '/events', /// @FIXME this takes you to an edit page and it may not be yours, we really want to just view the single event  --> '/events/event/' . $rr['event_hash'],
 						'name'        => $rr['xchan_name'],
 						'addr'        => $rr['xchan_addr'],
 						'url'         => $rr['xchan_url'],

Zotlabs/Module/Poster.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace Zotlabs\Module;
-
-use Zotlabs\Web\Controller;
-
-require_once('include/security.php');
-
-class Poster extends Controller {
-
-	function init() {
-
-		$nick = argv(1);
-		$hash = argv(2);
-
-		if(! ($nick && $hash)) {
-			return;
-		}
-
-		$u = channelx_by_nick($nick);
-
-		$sql_extra = permissions_sql(intval($u['channel_id']));
-
-		$r = q("select content from attach where hash = '%s' and uid = %d and os_storage = 1 $sql_extra limit 1",
-			dbesc($hash),
-			intval($u['channel_id'])
-		);
-		if($r) {
-			$path = dbunescbin($r[0]['content']);
-			if($path && @file_exists($path . '.thumb')) {
-				header('Content-Type: image/jpeg');
-				echo file_get_contents($path . '.thumb');
-				killme();
-			}
-		}
-	}
-}

Zotlabs/Module/Profile_photo.php

@@ -52,39 +52,14 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			return;
 		}
 		
-		$channel = \App::get_channel();
-		
 		check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
-		
-		// Remove cover photo
-		if(isset($_POST['remove'])) {
-			
-			$r = q("SELECT resource_id FROM photo WHERE photo_usage = %d AND uid = %d LIMIT 1",
-				intval(PHOTO_PROFILE),
-				intval(local_channel())
-			);
-			
-			if($r) {
-			    q("update photo set photo_usage = %d where photo_usage = %d and uid = %d",
-			    	intval(PHOTO_NORMAL),
-				    intval(PHOTO_PROFILE),
-				    intval(local_channel())
-			    );
-			
-				$sync = attach_export_data($channel,$r[0]['resource_id']);
-				if($sync)
-				    build_sync_packet($channel['channel_id'],array('file' => array($sync)));
-			}
-			
-			$_SESSION['reload_avatar'] = true;
-			
-			goaway(z_root() . '/profiles');
-		}
 	        
 		if((array_key_exists('cropfinal',$_POST)) && (intval($_POST['cropfinal']) == 1)) {
 	
 			// logger('crop: ' . print_r($_POST,true));
 
+
+
 			// phase 2 - we have finished cropping
 	
 			if(argc() != 2) {
@@ -144,48 +119,39 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 						'filename'     => $base_image['filename'], 
 						'album'        => t('Profile Photos'),
 						'os_path'      => $base_image['os_path'],
-						'display_path' => $base_image['display_path'],
-						'photo_usage'  => PHOTO_PROFILE,
-						'edited'	   => dbescdate($base_image['edited'])
+						'display_path' => $base_image['display_path']
 					];
 	
+					$p['imgscale']    = PHOTO_RES_PROFILE_300;
 					$p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
 	
-					$r1 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_300);
+					$r1 = $im->save($p);
 	
 					$im->scaleImage(80);
-					$r2 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_80);
+					$p['imgscale'] = PHOTO_RES_PROFILE_80;
+	
+					$r2 = $im->save($p);
 				
 					$im->scaleImage(48);
-					$r3 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_48);
-
+					$p['imgscale'] = PHOTO_RES_PROFILE_48;
+	
+					$r3 = $im->save($p);
+				
 					if($r1 === false || $r2 === false || $r3 === false) {
 						// if one failed, delete them all so we can start over.
 						notice( t('Image resize failed.') . EOL );
-						$x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d )",
+						$x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ",
 							dbesc($base_image['resource_id']),
 							local_channel(),
 							intval(PHOTO_RES_PROFILE_300),
 							intval(PHOTO_RES_PROFILE_80),
 							intval(PHOTO_RES_PROFILE_48)
 						);
-
-						$x = q("SELECT content FROM photo WHERE resource_id = '%s' AND uid = %d AND os_storage = 1 AND imgscale IN ( %d, %d, %d )",
-							dbesc($base_image['resource_id']),
-							local_channel(),
-							intval(PHOTO_RES_PROFILE_300),
-							intval(PHOTO_RES_PROFILE_80),
-							intval(PHOTO_RES_PROFILE_48)
-						);
-						if($x) {
-							foreach($x as $xx) {
-								@unlink(dbunescbin($xx['content']));
-							}
-						}
-						
 						return;
 					}
 	
+					$channel = \App::get_channel();
+	
 					// If setting for the default profile, unset the profile photo flag from any other photos I own
 	
 					if($is_default_profile) {
@@ -232,7 +198,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 					$r = q("UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s'  
 						where xchan_hash = '%s'",
 						dbesc($im->getType()),
-						dbescdate($base_image['edited']),
+						dbesc(datetime_convert()),
 						dbesc(z_root() . '/photo/profile/l/' . $channel['channel_id']),
 						dbesc(z_root() . '/photo/profile/m/' . $channel['channel_id']),
 						dbesc(z_root() . '/photo/profile/s/' . $channel['channel_id']),
@@ -279,7 +245,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 		else {
 			require_once('include/attach.php');
 	
-			$res = attach_store(\App::get_channel(), get_observer_hash(), '', array('album' => t('Profile Photos'), 'hash' => $hash, 'nosync' => true));
+			$res = attach_store(\App::get_channel(), get_observer_hash(), '', array('album' => t('Profile Photos'), 'hash' => $hash));
 	
 			logger('attach_store: ' . print_r($res,true));
 		}
@@ -387,23 +353,20 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 	
 			if($havescale) {
 				// unset any existing profile photos
-				$x = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d",
+				$r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d",
 					intval(PHOTO_NORMAL),
 					intval(PHOTO_PROFILE),
-					intval(local_channel())
-				);
-
-				$edited = datetime_convert();
-				
-				$x = q("UPDATE photo SET photo_usage = %d, edited = '%s' WHERE uid = %d AND resource_id = '%s' AND imgscale > 0",
+					intval(local_channel()));
+	
+				$r = q("UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'",
 					intval(PHOTO_PROFILE),
-					dbescdate($edited),
 					intval(local_channel()),
 					dbesc($resource_id)
-				);
+					);
 	
-				$x = q("UPDATE xchan SET xchan_photo_date = '%s' WHERE xchan_hash = '%s'",
-					dbescdate($edited),
+				$r = q("UPDATE xchan set xchan_photo_date = '%s' 
+					where xchan_hash = '%s'",
+					dbesc(datetime_convert()),
 					dbesc($channel['xchan_hash'])
 				);
 	
@@ -413,10 +376,8 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				if($sync)
 					build_sync_packet($channel['channel_id'],array('file' => array($sync)));
 
-				$_SESSION['reload_avatar'] = true;
 
 				\Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
-				
 				goaway(z_root() . '/profiles');
 			}
 	
@@ -496,7 +457,6 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				'$lbl_profiles' => t('Select a profile:'),
 				'$title' => (($importing) ? t('Use Photo for Profile') : t('Change Profile Photo')),
 				'$submit' => (($importing) ? t('Use') : t('Upload')),
-				'$remove' => t('Remove'),
 				'$profiles' => $profiles,
 				'$single' => ((count($profiles) == 1) ? true : false),
 				'$profile0' => $profiles[0],

Zotlabs/Module/Pubstream.php

@@ -62,11 +62,6 @@ class Pubstream extends \Zotlabs\Web\Controller {
 		$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
 		$net    = ((array_key_exists('net',$_REQUEST))    ? escape_tags($_REQUEST['net']) : '');
 
-		$title = replace_macros(get_markup_template("section_title.tpl"),array(
-			'$title' => (($hashtags) ? '#' . htmlspecialchars($hashtags, ENT_COMPAT,'UTF-8') : '')
-		));
-
-		$o = (($hashtags) ? $title : '');
 
 		if(local_channel() && (! $update)) {
 	
@@ -99,7 +94,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
 				'reset'               => t('Reset form')
 			);
 	
-			$o .= '<div id="jot-popup">';
+			$o = '<div id="jot-popup">';
 			$o .= status_editor($a,$x,false,'Pubstream');
 			$o .= '</div>';
 		}
@@ -144,7 +139,6 @@ class Pubstream extends \Zotlabs\Web\Controller {
 				'$conv'    => '0',
 				'$spam'    => '0',
 				'$fh'      => '1',
-				'$dm'      => '0',
 				'$nouveau' => '0',
 				'$wall'    => '0',
 				'$list'    => '0',
@@ -291,7 +285,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
 		}
 	
 		// fake it
-		$mode = (($hashtags) ? 'search' : 'pubstream');
+		$mode = ('pubstream');
 	
 		$o .= conversation($items,$mode,$update,$page_mode);
 

Zotlabs/Module/React.php

@@ -59,14 +59,6 @@ class React extends \Zotlabs\Web\Controller {
 			$n['body'] = "\n\n[zmg=32x32]" . z_root() . '/images/emoji/' . $emoji . '.png[/zmg]' . "\n\n";
 			$n['author_xchan'] = $channel['channel_hash'];
 
-			$n['tgt_type'] = 'Image';
-			$n['target'] = [
-				'type' => 'Image',
-				'name' => $emoji,
-				'url'  => z_root() . '/images/emoji/' . $emoji . '.png'
-			];
-
-
 			$x = item_store($n); 
 
 			retain_item($postid);

Zotlabs/Module/Register.php

@@ -1,11 +1,10 @@
 <?php
 namespace Zotlabs\Module;
 
-use Zotlabs\Web\Controller;
+require_once('include/channel.php');
 
-require_once('include/security.php');
 
-class Register extends Controller {
+class Register extends \Zotlabs\Web\Controller {
 
 	function init() {
 	
@@ -40,9 +39,7 @@ class Register extends Controller {
 	
 	
 	function post() {
-
-		check_form_security_token_redirectOnErr('/register', 'register');
-
+	
 		$max_dailies = intval(get_config('system','max_daily_registrations'));
 		if($max_dailies) {
 			$r = q("select count(account_id) as total from account where account_created > %s - INTERVAL %s",
@@ -272,8 +269,7 @@ class Register extends Controller {
 		require_once('include/bbcode.php');
 	
 		$o = replace_macros(get_markup_template('register.tpl'), array(
-
-			'$form_security_token' => get_form_security_token("register"),
+	
 			'$title'        => t('Registration'),
 			'$reg_is'       => $registration_is,
 			'$registertext' => bbcode(get_config('system','register_text')),

Zotlabs/Module/Search.php

@@ -38,8 +38,8 @@ class Search extends \Zotlabs\Web\Controller {
 		$observer_hash = (($observer) ? $observer['xchan_hash'] : '');
 	
 		$o = '<div id="live-search"></div>' . "\r\n";
-
-		$o .= '<div class="generic-content-wrapper-styled">' . "\r\n";
+	
+	        $o = '<div class="generic-content-wrapper-styled">' . "\r\n";
 	
 		$o .= '<h3>' . t('Search') . '</h3>';
 	
@@ -128,7 +128,6 @@ class Search extends \Zotlabs\Web\Controller {
 				'$conv' => '0',
 				'$spam' => '0',
 				'$fh' => '0',
-				'$dm' => '0',
 				'$nouveau' => '0',
 				'$wall' => '0',
 				'$static' => $static,

Zotlabs/Module/Settings/Calendar.php

@@ -36,7 +36,7 @@ class Calendar {
 			'$rpath' => $rpath,
 			'$action_url' => 'settings/' . $module,
 			'$form_security_token' => get_form_security_token('settings_' . $module),
-			'$title' => t('Calendar Settings'),
+			'$title' => t('CalDAV Settings'),
 			'$features'  => process_module_features_get(local_channel(), $features),
 			'$submit'    => t('Submit')
 		));

Zotlabs/Module/Setup.php

@@ -377,7 +377,7 @@ class Setup extends \Zotlabs\Web\Controller {
 
 		if(version_compare(PHP_VERSION, '7.1') < 0) {
 			$help .= t('PHP version 7.1 or greater is required.');
-			$this->check_add($checks, t('PHP version'), false, true, $help);
+			$this->check_add($checks, t('PHP version'), false, false, $help);
 		}
 
 		if(strlen($phpath)) {

Zotlabs/Module/Share.php

@@ -106,7 +106,7 @@ class Share extends \Zotlabs\Web\Controller {
 		$arr['owner_xchan']  = $item['author_xchan'];
 		$arr['obj'] = Activity::encode_item($item);
 		$arr['obj_type'] = $item['obj_type'];
-		$arr['verb'] = ACTIVITY_SHARE;
+		$arr['verb'] = 'Announce';
 
 		$post = item_store($arr);	
 

Zotlabs/Module/Sse.php

@@ -1,121 +0,0 @@
-<?php
-
-namespace Zotlabs\Module;
-
-use App;
-use Zotlabs\Lib\Apps;
-use Zotlabs\Web\Controller;
-use Zotlabs\Lib\Enotify;
-use Zotlabs\Lib\XConfig;
-
-class Sse extends Controller {
-
-	public static $uid;
-	public static $ob_hash;
-	public static $sse_id;
-	public static $vnotify;
-
-	function init() {
-
-		if((observer_prohibited(true))) {
-			killme();
-		}
-
-		if(! intval(get_config('system','open_pubstream',1))) {
-			if(! get_observer_hash()) {
-				killme();
-			}
-		}
-
-		// this is important!
-		session_write_close();
-
-		self::$uid = local_channel();
-		self::$ob_hash = get_observer_hash();
-		self::$sse_id = false;
-
-		if(! self::$ob_hash) {
-			if(session_id()) {
-				self::$sse_id = true;
-				self::$ob_hash = 'sse_id.' . session_id();
-			}
-			else {
-				return;
-			}
-		}
-
-		self::$vnotify = get_pconfig(self::$uid, 'system', 'vnotify');
-
-		$sys = get_sys_channel();
-		$sleep_seconds = 3;
-
-		header("Content-Type: text/event-stream");
-		header("Cache-Control: no-cache");
-		header("Connection: keep-alive");
-		header("X-Accel-Buffering: no");
-
-		while(true) {
-
-			/**
-			 * Update chat presence indication (if applicable)
-			 */
-
-			if(! self::$sse_id) {
-				$r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s' and cp_room = 0 limit 1",
-					dbesc(self::$ob_hash),
-					dbesc($_SERVER['REMOTE_ADDR'])
-				);
-				$basic_presence = false;
-				if($r) {
-					$basic_presence = true;
-					q("update chatpresence set cp_last = '%s' where cp_id = %d",
-						dbesc(datetime_convert()),
-						intval($r[0]['cp_id'])
-					);
-				}
-				if(! $basic_presence) {
-					q("insert into chatpresence ( cp_xchan, cp_last, cp_status, cp_client)
-						values( '%s', '%s', '%s', '%s' ) ",
-						dbesc(self::$ob_hash),
-						dbesc(datetime_convert()),
-						dbesc('online'),
-						dbesc($_SERVER['REMOTE_ADDR'])
-					);
-				}
-			}
-
-			XConfig::Load(self::$ob_hash);
-
-			$result = XConfig::Get(self::$ob_hash, 'sse', 'notifications', []);
-			$lock = XConfig::Get(self::$ob_hash, 'sse', 'lock');
-
-			if($result && !$lock) {
-				echo "event: notifications\n";
-				echo 'data: ' . json_encode($result);
-				echo "\n\n";
-
-				XConfig::Set(self::$ob_hash, 'sse', 'notifications', []);
-				unset($result);
-			}
-
-			// always send heartbeat to detect disconnected clients
-			echo "event: heartbeat\n";
-			echo 'data: {}';
-			echo "\n\n";
-
-			ob_end_flush();
-			flush();
-
-			if(connection_status() != CONNECTION_NORMAL || connection_aborted()) {
-				//TODO: this does not seem to be triggered
-				XConfig::Set(self::$ob_hash, 'sse', 'timestamp', NULL_DATE);
-				break;
-			}
-
-			sleep($sleep_seconds);
-
-		}
-
-	}
-
-}

Zotlabs/Module/Sse_bs.php

@@ -1,550 +0,0 @@
-<?php
-
-namespace Zotlabs\Module;
-
-use App;
-use Zotlabs\Lib\Apps;
-use Zotlabs\Web\Controller;
-use Zotlabs\Lib\Enotify;
-
-class Sse_bs extends Controller {
-
-	public static $uid;
-	public static $ob_hash;
-	public static $sse_id;
-	public static $vnotify;
-	public static $evdays;
-	public static $limit;
-	public static $offset;
-	public static $xchans;
-
-	function init() {
-
-		self::$uid = local_channel();
-		self::$ob_hash = get_observer_hash();
-		self::$sse_id = false;
-
-		if(! self::$ob_hash) {
-			if(session_id()) {
-				self::$sse_id = true;
-				self::$ob_hash = 'sse_id.' . session_id();
-			}
-			else {
-				return;
-			}
-		}
-
-		self::$vnotify = get_pconfig(self::$uid, 'system', 'vnotify');
-		self::$evdays = intval(get_pconfig(self::$uid, 'system', 'evdays'));
-		self::$limit = 100;
-		self::$offset = 0;
-		self::$xchans = '';
-
-		if(!empty($_GET['nquery']) && $_GET['nquery'] !== '%') {
-			$nquery = $_GET['nquery'];
-
-			$x = q("SELECT xchan_hash FROM xchan WHERE xchan_name LIKE '%s' OR xchan_addr LIKE '%s'",
-				dbesc($nquery . '%'),
-				dbesc($nquery . '%')
-			);
-
-			self::$xchans = ids_to_querystr($x, 'xchan_hash', true);
-		}
-
-		if(intval(argv(2)) > 0)
-			self::$offset = argv(2);
-		else
-			$_SESSION['sse_loadtime'] = datetime_convert();
-
-		$network = false;
-		$home = false;
-		$pubs = false;
-		$f = '';
-
-		switch (argv(1)) {
-			case 'network':
-				$network = true;
-				$f = 'bs_network';
-				break;
-			case 'home':
-				$home = true;
-				$f = 'bs_home';
-				break;
-			case 'pubs':
-				$pubs = true;
-				$f = 'bs_pubs';
-				break;
-			default:
-		}
-
-		if(self::$offset && $f) {
-			$result = self::$f(true);
-			json_return_and_die($result);
-		}
-
-		$result = array_merge(
-			self::bs_network($network),
-			self::bs_home($home),
-			self::bs_notify(),
-			self::bs_intros(),
-			self::bs_forums(),
-			self::bs_pubs($pubs),
-			self::bs_files(),
-			self::bs_mail(),
-			self::bs_all_events(),
-			self::bs_register()
-		);
-
-		set_xconfig(self::$ob_hash, 'sse', 'timestamp', datetime_convert());
-		set_xconfig(self::$ob_hash, 'sse', 'notifications', []); // reset the cache
-		set_xconfig(self::$ob_hash, 'sse', 'language', App::$language);
-
-		json_return_and_die($result);
-	}
-
-	function bs_network($notifications) {
-
-		$result['network']['notifications'] = [];
-		$result['network']['count'] = 0;
-
-		if(! self::$uid)
-			return $result;
-
-		$limit = intval(self::$limit);
-		$offset = self::$offset;
-
-		$sql_extra = '';
-		if(! (self::$vnotify & VNOTIFY_LIKE))
-			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
-
-		$sql_extra2 = '';
-		if(self::$xchans)
-			$sql_extra2 = " AND (author_xchan IN (" . self::$xchans . ") OR owner_xchan IN (" . self::$xchans . ")) ";
-
-		$item_normal = item_normal();
-
-		if ($notifications) {
-			$items = q("SELECT * FROM item 
-				WHERE uid = %d
-				AND created <= '%s'
-				AND item_unseen = 1 AND item_wall = 0 
-				AND author_xchan != '%s'
-				$item_normal
-				$sql_extra
-				$sql_extra2
-				ORDER BY created DESC LIMIT $limit OFFSET $offset",
-				intval(self::$uid),
-				dbescdate($_SESSION['sse_loadtime']),
-				dbesc(self::$ob_hash)
-			);
-
-			if($items) {
-				$result['network']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
-				xchan_query($items);
-				foreach($items as $item) {
-					$result['network']['notifications'][] = Enotify::format($item);
-				}
-			}
-			else {
-				$result['network']['offset'] = -1;
-			}
-
-		}
-
-		$r = q("SELECT count(id) as total FROM item 
-			WHERE uid = %d and item_unseen = 1 AND item_wall = 0 
-			$item_normal
-			$sql_extra
-			AND author_xchan != '%s'",
-			intval(self::$uid),
-			dbesc(self::$ob_hash)
-		);
-
-		if($r)
-			$result['network']['count'] = intval($r[0]['total']);
-
-		return $result;
-	}
-
-	function bs_home($notifications) {
-
-		$result['home']['notifications'] = [];
-		$result['home']['count'] = 0;
-
-		if(! self::$uid)
-			return $result;
-
-		$limit = intval(self::$limit);
-		$offset = self::$offset;
-
-		$sql_extra = '';
-		if(! (self::$vnotify & VNOTIFY_LIKE))
-			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
-
-		$sql_extra2 = '';
-		if(self::$xchans)
-			$sql_extra2 = " AND (author_xchan IN (" . self::$xchans . ") OR owner_xchan IN (" . self::$xchans . ")) ";
-
-
-		$item_normal = item_normal();
-
-		if ($notifications) {
-			$items = q("SELECT * FROM item 
-				WHERE uid = %d
-				AND created <= '%s'
-				AND item_unseen = 1 AND item_wall = 1 
-				AND author_xchan != '%s'
-				$item_normal
-				$sql_extra
-				$sql_extra2
-				ORDER BY created DESC LIMIT $limit OFFSET $offset",
-				intval(self::$uid),
-				dbescdate($_SESSION['sse_loadtime']),
-				dbesc(self::$ob_hash)
-			);
-
-			if($items) {
-				$result['home']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
-				xchan_query($items);
-				foreach($items as $item) {
-					$result['home']['notifications'][] = Enotify::format($item);
-				}
-			}
-			else {
-				$result['home']['offset'] = -1;
-			}
-
-		}
-
-		$r = q("SELECT count(id) as total FROM item 
-			WHERE uid = %d and item_unseen = 1 AND item_wall = 1 
-			$item_normal
-			$sql_extra
-			AND author_xchan != '%s'",
-			intval(self::$uid),
-			dbesc(self::$ob_hash)
-		);
-
-		if($r)
-			$result['home']['count'] = intval($r[0]['total']);
-
-		return $result;
-	}
-
-	function bs_pubs($notifications) {
-
-		$result['pubs']['notifications'] = [];
-		$result['pubs']['count'] = 0;
-
-		if((observer_prohibited(true))) {
-			return $result;
-		}
-
-		if(! intval(get_config('system','open_pubstream',1))) {
-			if(! get_observer_hash()) {
-				return $result;
-			}
-		}
-
-		if(! isset($_SESSION['static_loadtime']))
-			$_SESSION['static_loadtime'] = datetime_convert();
-
-		$limit = intval(self::$limit);
-		$offset = self::$offset;
-
-		$sys = get_sys_channel();
-		$sql_extra = '';
-		if(! (self::$vnotify & VNOTIFY_LIKE))
-			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
-
-		$sql_extra2 = '';
-		if(self::$xchans)
-			$sql_extra2 = " AND (author_xchan IN (" . self::$xchans . ") OR owner_xchan IN (" . self::$xchans . ")) ";
-
-		$item_normal = item_normal();
-
-		if ($notifications) {
-			$items = q("SELECT * FROM item 
-				WHERE uid = %d
-				AND created <= '%s'
-				AND item_unseen = 1
-				AND author_xchan != '%s'
-				AND created > '%s'
-				$item_normal
-				$sql_extra
-				$sql_extra2
-				ORDER BY created DESC LIMIT $limit OFFSET $offset",
-				intval($sys['channel_id']),
-				dbescdate($_SESSION['sse_loadtime']),
-				dbesc(self::$ob_hash),
-				dbescdate($_SESSION['static_loadtime'])
-			);
-
-			if($items) {
-				$result['pubs']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
-				xchan_query($items);
-				foreach($items as $item) {
-					$result['pubs']['notifications'][] = Enotify::format($item);
-				}
-			}
-			else {
-				$result['pubs']['offset'] = -1;
-			}
-
-
-		}
-
-		$r = q("SELECT count(id) as total FROM item 
-			WHERE uid = %d AND item_unseen = 1
-			AND created > '%s'
-			$item_normal
-			$sql_extra
-			AND author_xchan != '%s'",
-			intval($sys['channel_id']),
-			dbescdate($_SESSION['static_loadtime']),
-			dbesc(self::$ob_hash)
-		);
-
-		if($r)
-			$result['pubs']['count'] = intval($r[0]['total']);
-
-		return $result;
-	}
-
-
-	function bs_notify() {
-
-		$result['notify']['notifications'] = [];
-		$result['notify']['count'] = 0;
-		$result['notify']['offset'] = -1;
-
-		if(! self::$uid)
-			return $result;
-
-		$r = q("SELECT * FROM notify WHERE uid = %d AND seen = 0 ORDER BY created DESC",
-			intval(self::$uid)
-		);
-		if($r) {
-			foreach($r as $rr) {
-				$result['notify']['notifications'][] = Enotify::format_notify($rr);
-			}
-			$result['notify']['count'] = count($r);
-		}
-
-		return $result;
-
-	}
-
-	function bs_intros() {
-
-		$result['intros']['notifications'] = [];
-		$result['intros']['count'] = 0;
-		$result['intros']['offset'] = -1;
-
-		if(! self::$uid)
-			return $result;
-
-		$r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ORDER BY abook_created DESC LIMIT 50",
-			intval(self::$uid)
-		);
-
-		if($r) {
-			foreach($r as $rr) {
-				$result['intros']['notifications'][] = Enotify::format_intros($rr);
-			}
-			$result['intros']['count'] = count($r);
-		}
-
-		return $result;
-
-	}
-
-	function bs_forums() {
-
-		$result['forums']['notifications'] = [];
-		$result['forums']['count'] = 0;
-		$result['forums']['offset'] = -1;
-
-		if(! self::$uid)
-			return $result;
-
-		$forums = get_forum_channels(self::$uid);
-
-		if($forums) {
-			$item_normal = item_normal();
-
-			$sql_extra = '';
-			if(! (self::$vnotify & VNOTIFY_LIKE))
-				$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
-
-			$fcount = count($forums);
-			$i = 0;
-
-			for($x = 0; $x < $fcount; $x ++) {
-				$p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'",
-					intval(self::$uid),
-					intval(TERM_FORUM),
-					dbesc($forums[$x]['xchan_name'])
-				);
-
-				$p_str = ids_to_querystr($p, 'parent');
-				$p_sql = (($p_str) ? "OR parent IN ( $p_str )" : '');
-
-				$r = q("select mid from item 
-					where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $sql_extra $item_normal",
-					intval(self::$uid),
-					dbesc($forums[$x]['xchan_hash']),
-					dbesc($forums[$x]['xchan_hash'])
-				);
-
-				if($r) {
-					$mids = flatten_array_recursive($r);
-
-
-					foreach($mids as $mid)
-						$b64mids[] =  'b64.' . base64url_encode($mid);
-
-					$forums[$x]['notify_link'] = z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id'];
-					$forums[$x]['name'] = $forums[$x]['xchan_name'];
-					$forums[$x]['addr'] = $forums[$x]['xchan_addr'];
-					$forums[$x]['url'] = $forums[$x]['xchan_url'];
-					$forums[$x]['photo'] = $forums[$x]['xchan_photo_s'];
-					$forums[$x]['unseen'] = count($b64mids);
-					$forums[$x]['private_forum'] = (($forums[$x]['private_forum']) ? 'lock' : '');
-					$forums[$x]['message'] = (($forums[$x]['private_forum']) ? t('Private forum') : t('Public forum'));
-					$forums[$x]['mids'] = json_encode($b64mids);
-
-					unset($forums[$x]['abook_id']);
-					unset($forums[$x]['xchan_hash']);
-					unset($forums[$x]['xchan_name']);
-					unset($forums[$x]['xchan_url']);
-					unset($forums[$x]['xchan_photo_s']);
-
-					$i = $i + count($mids);
-
-				}
-				else {
-					unset($forums[$x]);
-				}
-			}
-
-			$result['forums']['count'] = $i;
-			$result['forums']['notifications'] = array_values($forums);
-
-		}
-
-		return $result;
-
-	}
-
-	function bs_files() {
-
-		$result['files']['notifications'] = [];
-		$result['files']['count'] = 0;
-		$result['files']['offset'] = -1;
-
-		if(! self::$uid)
-			return $result;
-
-		$r = q("SELECT * FROM item 
-			WHERE verb = '%s'
-			AND obj_type = '%s'
-			AND uid = %d
-			AND owner_xchan != '%s'
-			AND item_unseen = 1",
-			dbesc(ACTIVITY_POST),
-			dbesc(ACTIVITY_OBJ_FILE),
-			intval(self::$uid),
-			dbesc(self::$ob_hash)
-		);
-		if($r) {
-			xchan_query($r);
-			foreach($r as $rr) {
-				$result['files']['notifications'][] = Enotify::format_files($rr);
-			}
-			$result['files']['count'] = count($r);
-		}
-
-		return $result;
-
-	}
-
-	function bs_mail() {
-
-		$result['mail']['notifications'] = [];
-		$result['mail']['count'] = 0;
-		$result['mail']['offset'] = -1;
-
-		if(! self::$uid)
-			return $result;
-
-		$r = q("select mail.*, xchan.* from mail left join xchan on xchan_hash = from_xchan
-			where channel_id = %d and mail_seen = 0 and mail_deleted = 0
-			and from_xchan != '%s' order by created desc",
-			intval(self::$uid),
-			dbesc(self::$ob_hash)
-		);
-
-		if($r) {
-			foreach($r as $rr) {
-				$result['mail']['notifications'][] = Enotify::format_mail($rr);
-			}
-			$result['mail']['count'] = count($r);
-		}
-
-		return $result;
-
-	}
-
-	function bs_all_events() {
-
-		$result['all_events']['notifications'] = [];
-		$result['all_events']['count'] = 0;
-		$result['all_events']['offset'] = -1;
-
-		if(! self::$uid)
-			return $result;
-
-		$r = q("SELECT * FROM event left join xchan on event_xchan = xchan_hash
-			WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
-			and etype in ( 'event', 'birthday' )
-			ORDER BY dtstart DESC",
-			intval(self::$uid),
-			dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval(self::$evdays) . ' days')),
-			dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
-		);
-
-		if($r) {
-			foreach($r as $rr) {
-				$result['all_events']['notifications'][] = Enotify::format_all_events($rr);
-			}
-			$result['all_events']['count'] = count($r);
-		}
-
-		return $result;
-	}
-
-	function bs_register() {
-
-		$result['register']['notifications'] = [];
-		$result['register']['count'] = 0;
-		$result['register']['offset'] = -1;
-
-		if(! self::$uid && ! is_site_admin())
-			return $result;
-
-		$r = q("SELECT account_email, account_created from account where (account_flags & %d) > 0",
-			intval(ACCOUNT_PENDING)
-		);
-		if($r) {
-			foreach($r as $rr) {
-				$result['register']['notifications'][] = Enotify::format_register($rr);
-			}
-			$result['register']['count'] = count($r);
-		}
-
-		return $result;
-
-	}
-
-}

Zotlabs/Module/Viewconnections.php

@@ -74,29 +74,6 @@ class Viewconnections extends \Zotlabs\Web\Controller {
 			if(! intval(get_abconfig(\App::$profile['uid'],$rr['xchan_hash'],'their_perms','post_comments'))) {
 				$oneway = true;
 			}
-
-			$perminfo=[];
-			$perminfo['connpermcount']=0;
-			$perminfo['connperms']=t('Accepts').': ';
-			if(intval(get_abconfig(\App::$profile['uid'],$rr['xchan_hash'],'their_perms','post_comments'))) {
-				$perminfo['connpermcount']++;
-				$perminfo['connperms'] .= t('Comments');
-			}
-			if(intval(get_abconfig(\App::$profile['uid'],$rr['xchan_hash'],'their_perms','send_stream'))) {
-				$perminfo['connpermcount']++;
-				$perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ', ' : $perminfo['connperms'] ;
-				$perminfo['connperms'] .= t('Stream items');
-			}
-			if(intval(get_abconfig(\App::$profile['uid'],$rr['xchan_hash'],'their_perms','post_wall'))) {
-				$perminfo['connpermcount']++;
-				$perminfo['connperms'] = ($perminfo['connperms']) ? $perminfo['connperms'] . ', ' : $perminfo['connperms'] ;
-				$perminfo['connperms'] .= t('Wall posts');
-			}
-
-			if ($perminfo['connpermcount'] == 0) {
-				$perminfo['connperms'] .= t('Nothing');
-			}
-
 	
 			$url = chanlink_hash($rr['xchan_hash']);
 			if($url) {
@@ -111,7 +88,6 @@ class Viewconnections extends \Zotlabs\Web\Controller {
 					'sparkle' => '',
 					'itemurl' => $rr['url'],
 					'network' => '',
-					'perminfo' => $perminfo,
 					'oneway' => $oneway
 				);
 			}

Zotlabs/Module/Vote.php

@@ -1,143 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-use App;
-use Zotlabs\Web\Controller;
-use Zotlabs\Lib\Activity;
-use Zotlabs\Daemon\Master;
-use Zotlabs\Lib\Libsync;
-
-class Vote extends Controller {
-
-	function init() {
-
-		$ret = [ 'success' => false, 'message' => EMPTY_STR ];
-
-		$channel = App::get_channel();
-
-		if (! $channel) {
-			$ret['message'] = t('Permission denied.');
-			json_return_and_die($ret);
-		}
-
-
-		$fetch = null;
-		$id = argv(1);
-		$response = $_REQUEST['answer'];
-		
-		if ($id) {
-			$fetch = q("select * from item where id = %d limit 1",
-				intval($id)
-			);
-		}
-
-
-		if ($fetch && $fetch[0]['obj_type'] === 'Question') {
-			$obj = json_decode($fetch[0]['obj'],true);
-
-		}
-		else {
-			$ret['message'] = t('Poll not found.');
-			json_return_and_die($ret);
-		}
-
-		$valid = false;
-		
-		if ($obj['oneOf']) {
-			foreach($obj['oneOf'] as $selection) {
-				//		logger('selection: ' . $selection);
-				//		logger('response: ' . $response);
-				if($selection['name'] && $selection['name'] === $response) {
-					$valid = true;
-				}
-			}
-		}
-
-		$choices = [];
-		if ($obj['anyOf']) {
-			foreach ($obj['anyOf'] as $selection) {
-				$choices[] = $selection['name'];
-			}
-			foreach ($response as $res) {
-				if (! in_array($res,$choices)) {
-					$valid = false;
-					break;
-				}
-				$valid = true;
-			}
-		}
-
-		if (! $valid) {
-			$ret['message'] = t('Invalid response.');
-			json_return_and_die($ret);
-		}
-
-		if (! is_array($response)) {
-			$response = [ $response ];
-		}
-
-		foreach ($response as $res) {
-
-			$item = [];
-
-
-			$item['aid'] = $channel['channel_account_id'];
-			$item['uid'] = $channel['channel_id'];
-			$item['item_origin'] = 1;
-			$item['parent'] = $fetch[0]['id'];
-			$item['parent_mid'] = $fetch[0]['mid'];
-			$item['thr_parent'] = $fetch[0]['mid'];
-			$item['uuid'] = new_uuid();
-			$item['mid'] = z_root() . '/item/' . $item['uuid'];
-			$item['verb'] = 'Create';
-			$item['title'] = $res;
-			$item['author_xchan'] = $channel['channel_hash'];
-			$item['owner_xchan'] = $fetch[0]['author_xchan'];
-			$item['allow_cid'] = '<' . $fetch[0]['author_xchan'] . '>';
-			$item['item_private'] = 1;
-
-			
-			$item['obj_type'] = 'Note';
-			$item['author'] = channelx_by_n($channel['channel_id']);
-
-			$item['obj'] = Activity::encode_item($item);
-
-			// now reset the placeholders
-
-			$item['verb'] = ACTIVITY_POST;
-			$item['obj_type'] = 'Answer';
-			unset($item['author']);
-
-
-			$x = item_store($item);
-
-
-			retain_item($fetch[0]['id']);
-
-			if($x['success']) {
-				$itemid = $x['item_id'];
-				Master::Summon( [ 'Notifier', 'like', $itemid ] );
-			}
-		
-			$r = q("select * from item where id = %d",
-				intval($itemid)
-			);
-			if ($r) {
-				xchan_query($r);
-				$sync_item = fetch_post_tags($r);
-				Libsync::build_sync_packet($channel['channel_id'], [ 'item' => [ encode_item($sync_item[0],true) ] ]);
-			}
-		}
-		$ret['success'] = true;
-		$ret['message'] = t('Response submitted. Updates may not appear instantly.');
-		json_return_and_die($ret);
-	}
-}
-
-
-
-
-
-
-
-

Zotlabs/Module/Wall_attach.php

@@ -86,7 +86,7 @@ class Wall_attach extends \Zotlabs\Web\Controller {
 		$def_attach = get_pconfig($channel['channel_id'],'system','attach_path');
 	
 		$r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : ''),'', array('source' => 'editor', 'visible' => 0, 'album' => $def_album, 'directory' => $def_attach, 'allow_cid' => '<' . $channel['channel_hash'] . '>'));
-
+	
 		if(! $r['success']) {
 			notice( $r['message'] . EOL);
 			killme();
@@ -96,41 +96,9 @@ class Wall_attach extends \Zotlabs\Web\Controller {
 			$s = "\n\n" . $r['body'] . "\n\n";
 		}
 		else {
-			if(strpos($r['data']['filetype'],'video') === 0) {
-				// give a wee bit of time for the background thumbnail processor to do its thing
-				// or else we'll never see a video poster
-				sleep(3);
-				$url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path'];
-				$thumb = Linkinfo::get_video_poster($url);
-				if($thumb) {
-					$s = "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n";
-				}
-				else {
-					$s = "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n";
-				}
-			}
-			if(strpos($r['data']['filetype'],'audio') === 0) {
-				$url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path'];
-				$s = "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n";
-			}
-			if ($r['data']['filetype'] === 'image/svg+xml') {
-				$x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-				if ($x) {
-					$bb = svg2bb($x);
-					if ($bb) {
-						$s .= "\n\n" . $bb;
-					}
-					else {
-						logger('empty return from svgbb');
-					}
-				}
-				else {
-					logger('unable to read svg data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
-				}
-			}
-						
-			$s .=  "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
+			$s =  "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
 		}
+	
 
 		$sync = attach_export_data($channel,$r['data']['hash']);
 		if($sync) {

Zotlabs/Module/Well_known.php

@@ -63,13 +63,6 @@ class Well_known extends \Zotlabs\Web\Controller {
 				case 'dnt-policy.txt':
 					echo file_get_contents('doc/dnt-policy.txt');
 					killme();
-					
-				case 'caldav':
-				case 'carddav':
-				    if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
-				        http_status('301', 'moved permanently');
-				        goaway(z_root() . '/cdav');
-				    };
 
 				default:
 					if(file_exists(\App::$cmd)) {

Zotlabs/Module/Wfinger.php

@@ -128,7 +128,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
 					'http://webfinger.net/ns/name'   => $r[0]['channel_name'],
 					'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name'],
 					'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey'],
-					'http://purl.org/zot/federation' => 'zot,zot6'
+					'http://purl.org/zot/federation' => 'zot'
 			];
 	
 			foreach($aliases as $alias) 

Zotlabs/Module/Wiki.php

@@ -293,9 +293,9 @@ class Wiki extends Controller {
 				}
 
 				//$wikiheaderName = urldecode($wikiUrlName);
-				$wikiheaderName = escape_tags(NativeWiki::name_decode($wikiUrlName));
+				$wikiheaderName = NativeWiki::name_decode($wikiUrlName);
 				//$wikiheaderPage = urldecode($pageUrlName);
-				$wikiheaderPage = escape_tags(NativeWiki::name_decode($pageUrlName));
+				$wikiheaderPage = NativeWiki::name_decode($pageUrlName);
 
 				$renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page'));
 				$sharePage  = t('Share');
@@ -373,13 +373,13 @@ class Wiki extends Controller {
 
 		$placeholder = t('Short description of your changes (optional)');
 
-		$zrl = z_root() . '/wiki/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName) . '/' . NativeWiki::name_encode($pageUrlName);
+		$zrl = urlencode( z_root() . '/wiki/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName) . '/' . NativeWiki::name_encode($pageUrlName) );
 		$o .= replace_macros(get_markup_template('wiki.tpl'),array(
 			'$wikiheaderName' => $wikiheaderName,
 			'$wikiheaderPage' => $wikiheaderPage,
 			'$renamePage' => $renamePage,
 			'$sharePage' => $sharePage,
-			'$shareLink' => urlencode('#^[zrl=' . $zrl . ']' . '[ ' . $owner['channel_name'] . ' ] ' . $wikiheaderName . ' - ' . $wikiheaderPage . '[/zrl]'),
+			'$shareLink' => '#^[zrl=' . $zrl . ']' . '[ ' . $owner['channel_name'] . ' ] ' . $wikiheaderName . ' - ' . $wikiheaderPage . '[/zrl]',
 			'$showPageControls' => $showPageControls,
 			'$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')),
 			'$tools_label' => 'Page Tools',

Zotlabs/Module/Zfinger.php

@@ -1,7 +1,6 @@
 <?php
 namespace Zotlabs\Module;
 
-use Zotlabs\Web\HTTPSig;
 
 class Zfinger extends \Zotlabs\Web\Controller {
 
@@ -24,9 +23,10 @@ class Zfinger extends \Zotlabs\Web\Controller {
 		$ret = json_encode($x);
 
 		if($chan) {
-			$headers['Digest'] = HTTPSig::generate_digest_header($ret);
-			$h = HTTPSig::create_sig($headers,$chan['channel_prvkey'],'acct:' . channel_reddress($chan));
-			HTTPSig::set_headers($h);
+			$hash = \Zotlabs\Web\HTTPSig::generate_digest($ret,false);
+			$headers['Digest'] = 'SHA-256=' . $hash;  
+			\Zotlabs\Web\HTTPSig::create_sig('',$headers,$chan['channel_prvkey'],
+				'acct:' . $chan['channel_address'] . '@' . \App::get_hostname(),true);
 		}
 		else {
 			foreach($headers as $k => $v) {

Zotlabs/Module/Zot_probe.php

@@ -3,7 +3,7 @@
 namespace Zotlabs\Module;
 
 use Zotlabs\Lib\Zotfinger;
-use Zotlabs\Web\HTTPSig;
+use Zotlabs\Zot6\HTTPSig;
 
 class Zot_probe extends \Zotlabs\Web\Controller {
 

Zotlabs/Module/Zotfeed.php

@@ -42,7 +42,7 @@ class Zotfeed extends \Zotlabs\Web\Controller {
 		}
 	
 		logger('zotfeed request: ' . $r[0]['channel_name'], LOGGER_DEBUG);
-		$result['project'] = 'Hubzilla';	
+	
 		$result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],array('mindate' => $mindate));
 		$result['success'] = true;
 		json_return_and_die($result);

Zotlabs/Photo/PhotoDriver.php

@@ -448,7 +448,6 @@ abstract class PhotoDriver {
 		$p['width'] = (($arr['width']) ? $arr['width'] : $this->getWidth());
 		$p['height'] = (($arr['height']) ? $arr['height'] : $this->getHeight());
 		$p['expires'] = (($arr['expires']) ? $arr['expires'] : gmdate('Y-m-d H:i:s', time() + get_config('system', 'photo_cache_time', 86400)));
-		$p['profile'] = ((array_key_exists('profile', $arr)) ? intval($arr['profile']) : 0);
 
 		if(! intval($p['imgscale']))
 			logger('save: ' . print_r($arr, true), LOGGER_DATA);
@@ -482,53 +481,18 @@ abstract class PhotoDriver {
 				allow_gid = '%s',
 				deny_cid = '%s',
 				deny_gid = '%s',
-				expires = '%s',
-				profile = %d
+				expires = '%s'
 				where id = %d",
-			intval($p['aid']), intval($p['uid']), dbesc($p['xchan']), dbesc($p['resource_id']), dbescdate($p['created']), dbescdate($p['edited']), dbesc(basename($p['filename'])), dbesc($p['mimetype']), dbesc($p['album']), intval($p['height']), intval($p['width']), (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())), intval($p['os_storage']), (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())), intval($p['imgscale']), intval($p['photo_usage']), dbesc($p['title']), dbesc($p['description']), dbesc($p['os_path']), dbesc($p['display_path']), dbesc($p['allow_cid']), dbesc($p['allow_gid']), dbesc($p['deny_cid']), dbesc($p['deny_gid']), dbescdate($p['expires']), intval($p['profile']), intval($x[0]['id']));
+			intval($p['aid']), intval($p['uid']), dbesc($p['xchan']), dbesc($p['resource_id']), dbescdate($p['created']), dbescdate($p['edited']), dbesc(basename($p['filename'])), dbesc($p['mimetype']), dbesc($p['album']), intval($p['height']), intval($p['width']), (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())), intval($p['os_storage']), (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())), intval($p['imgscale']), intval($p['photo_usage']), dbesc($p['title']), dbesc($p['description']), dbesc($p['os_path']), dbesc($p['display_path']), dbesc($p['allow_cid']), dbesc($p['allow_gid']), dbesc($p['deny_cid']), dbesc($p['deny_gid']), dbescdate($p['expires']), intval($x[0]['id']));
 		} else {
 			$p['created'] = (($arr['created']) ? $arr['created'] : $p['edited']);
 			$r = q("INSERT INTO photo
-				( aid, uid, xchan, resource_id, created, edited, filename, mimetype, album, height, width, content, os_storage, filesize, imgscale, photo_usage, title, description, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid, expires, profile )
-				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)", intval($p['aid']), intval($p['uid']), dbesc($p['xchan']), dbesc($p['resource_id']), dbescdate($p['created']), dbescdate($p['edited']), dbesc(basename($p['filename'])), dbesc($p['mimetype']), dbesc($p['album']), intval($p['height']), intval($p['width']), (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())), intval($p['os_storage']), (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())), intval($p['imgscale']), intval($p['photo_usage']), dbesc($p['title']), dbesc($p['description']), dbesc($p['os_path']), dbesc($p['display_path']), dbesc($p['allow_cid']), dbesc($p['allow_gid']), dbesc($p['deny_cid']), dbesc($p['deny_gid']), dbescdate($p['expires']), intval($p['profile']));
+				( aid, uid, xchan, resource_id, created, edited, filename, mimetype, album, height, width, content, os_storage, filesize, imgscale, photo_usage, title, description, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid, expires )
+				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", intval($p['aid']), intval($p['uid']), dbesc($p['xchan']), dbesc($p['resource_id']), dbescdate($p['created']), dbescdate($p['edited']), dbesc(basename($p['filename'])), dbesc($p['mimetype']), dbesc($p['album']), intval($p['height']), intval($p['width']), (intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())), intval($p['os_storage']), (intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())), intval($p['imgscale']), intval($p['photo_usage']), dbesc($p['title']), dbesc($p['description']), dbesc($p['os_path']), dbesc($p['display_path']), dbesc($p['allow_cid']), dbesc($p['allow_gid']), dbesc($p['deny_cid']), dbesc($p['deny_gid']), dbescdate($p['expires']));
 		}
 		logger('Photo save imgscale ' . $p['imgscale'] . ' returned ' . intval($r));
 
 		return $r;
 	}
-	
-	/**
-	 * @brief Stores thumbnail to database or filesystem.
-	 *
-	 * @param array $arr
-	 * @param scale int
-	 * @return boolean
-	 */
-	public function storeThumbnail($arr, $scale = 0) {
-	    
-	    // We only process thumbnails here
-	    if($scale == 0)
-	        return false;
-	    
-	    $arr['imgscale'] = $scale;
-
-		if(boolval(get_config('system','filesystem_storage_thumbnails', 0))) {
-			$channel = channelx_by_n($arr['uid']);
-			$arr['os_storage'] = 1;
-			$arr['os_syspath'] = 'store/' . $channel['channel_address'] . '/' . $arr['os_path'] . '-' . $scale;
-			if(! $this->saveImage($arr['os_syspath']))
-				return false;
-		}
-		else
-		    $arr['os_storage'] = 0;
-		
-		if(! $this->save($arr)) {
-			if(array_key_exists('os_syspath', $arr))
-				@unlink($arr['os_syspath']);
-			return false;
-		}
-		
-		return true;
-	}
 
 }

Zotlabs/Photo/PhotoGd.php

@@ -13,16 +13,12 @@ class PhotoGd extends PhotoDriver {
 	 * @see \Zotlabs\Photo\PhotoDriver::supportedTypes()
 	 */
 	public function supportedTypes() {
-
 		$t = [];
-
 		$t['image/jpeg'] = 'jpg';
 		if(imagetypes() & IMG_PNG)
 			$t['image/png'] = 'png';
 		if(imagetypes() & IMG_GIF)
 			$t['image/gif'] = 'gif';
-		if(imagetypes() & IMG_WEBP)
-			$t['image/webp'] = 'webp';
 
 		return $t;
 	}
@@ -146,7 +142,6 @@ class PhotoGd extends PhotoDriver {
 	 * @see \Zotlabs\Photo\PhotoDriver::imageString()
 	 */
 	public function imageString() {
-
 		if(! $this->is_valid())
 			return false;
 
@@ -155,32 +150,23 @@ class PhotoGd extends PhotoDriver {
 		ob_start();
 
 		switch($this->getType()){
-
 			case 'image/png':
 				$quality = get_config('system', 'png_quality');
 				if((! $quality) || ($quality > 9))
 					$quality = PNG_QUALITY;
+
 				\imagepng($this->image, NULL, $quality);
 				break;
-
-			case 'image/webp':
-			    $quality = get_config('system', 'webp_quality');
-			    if((! $quality) || ($quality > 100))
-			        $quality = WEBP_QUALITY;
-			    \imagewebp($this->image, NULL, $quality);
-			    break;
-
 			case 'image/jpeg':
 			// gd can lack imagejpeg(), but we verify during installation it is available
-
 			default:
 				$quality = get_config('system', 'jpeg_quality');
 				if((! $quality) || ($quality > 100))
 					$quality = JPEG_QUALITY;
+
 				\imagejpeg($this->image, NULL, $quality);
 				break;
 		}
-
 		$string = ob_get_contents();
 		ob_end_clean();
 

Zotlabs/Photo/PhotoImagick.php

@@ -8,16 +8,19 @@ namespace Zotlabs\Photo;
 class PhotoImagick extends PhotoDriver {
 
 	public function supportedTypes() {
-
-		$ret = [
+		return [
 			'image/jpeg' => 'jpg',
 			'image/png' => 'png',
-			'image/gif' => 'gif'
+			'image/gif' => 'gif',
 		];
-		if(\Imagick::queryFormats("WEBP"))
-			$ret['image/webp'] = 'webp';
+	}
 
-		return $ret;
+	private function get_FormatsMap() {
+		return [
+			'image/jpeg' => 'JPG',
+			'image/png' => 'PNG',
+			'image/gif' => 'GIF',
+		];
 	}
 
 
@@ -39,8 +42,8 @@ class PhotoImagick extends PhotoDriver {
 		 * Setup the image to the format it will be saved to
 		 */
 
-		$map = $this->supportedTypes();
-		$format = strtoupper($map[$type]);
+		$map = $this->get_FormatsMap();
+		$format = $map[$type];
 
 		if($this->image) {
 			$this->image->setFormat($format);
@@ -55,7 +58,6 @@ class PhotoImagick extends PhotoDriver {
 			 * setup the compression here, so we'll do it only once
 			 */
 			switch($this->getType()) {
-
 				case 'image/png':
 					$quality = get_config('system', 'png_quality');
 					if((! $quality) || ($quality > 9))
@@ -71,21 +73,11 @@ class PhotoImagick extends PhotoDriver {
 					$quality = $quality * 10;
 					$this->image->setCompressionQuality($quality);
 					break;
-
 				case 'image/jpeg':
 					$quality = get_config('system', 'jpeg_quality');
 					if((! $quality) || ($quality > 100))
 						$quality = JPEG_QUALITY;
 					$this->image->setCompressionQuality($quality);
-					break;
-
-				case 'image/webp':
-				    $quality = get_config('system', 'webp_quality');
-				    if((! $quality) || ($quality > 100))
-				        $quality = WEBP_QUALITY;
-				    $this->image->setCompressionQuality($quality);
-				    break;
-
 				default:
 					break;
 			}

Zotlabs/Render/SmartyInterface.php

@@ -2,10 +2,7 @@
 
 namespace Zotlabs\Render;
 
-use Smarty;
-use App;
-
-class SmartyInterface extends Smarty {
+class SmartyInterface extends \Smarty {
 
 	public $filename;
 
@@ -19,27 +16,26 @@ class SmartyInterface extends Smarty {
 		// The order is thus very important here
 
 		$template_dirs = array('theme' => "view/theme/$thname/tpl/");
-		if ( x(App::$theme_info,"extends") ) {
+		if( x(\App::$theme_info,"extends") )
 			$template_dirs = $template_dirs + array('extends' => "view/theme/" . \App::$theme_info["extends"] . "/tpl/");
-		}
 		$template_dirs = $template_dirs + array('base' => 'view/tpl/');
 		$this->setTemplateDir($template_dirs);
 
-		$basecompiledir = App::$config['system']['smarty3_folder'];
+        $basecompiledir = \App::$config['system']['smarty3_folder'];
         
 		$this->setCompileDir($basecompiledir.'/compiled/');
 		$this->setConfigDir($basecompiledir.'/config/');
 		$this->setCacheDir($basecompiledir.'/cache/');
 
-		$this->left_delimiter = App::get_template_ldelim('smarty3');
-		$this->right_delimiter = App::get_template_rdelim('smarty3');
+		$this->left_delimiter = \App::get_template_ldelim('smarty3');
+		$this->right_delimiter = \App::get_template_rdelim('smarty3');
 
 		// Don't report errors so verbosely
 		$this->error_reporting = E_ALL & (~E_NOTICE);
 	}
 
 	function parsed($template = '') {
-		if ($template) {
+		if($template) {
 			return $this->fetch('string:' . $template);
 		}
 		return $this->fetch('file:' . $this->filename);

Zotlabs/Render/SmartyTemplate.php

@@ -2,33 +2,28 @@
 
 namespace Zotlabs\Render;
 
-use App;
-
-
 class SmartyTemplate implements TemplateEngine {
 
 	static $name ="smarty3";
 	
-	public function __construct() {
+	public function __construct(){
 
 		// Cannot use get_config() here because it is called during installation when there is no DB.
 		// FIXME: this may leak private information such as system pathnames.
 
-        $basecompiledir = ((array_key_exists('smarty3_folder', App::$config['system'])) 
-			? App::$config['system']['smarty3_folder'] : '');
-        if (! $basecompiledir) {
-			$basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH;
-		}
-        if (! is_dir($basecompiledir)) {
+        $basecompiledir = ((array_key_exists('smarty3_folder',\App::$config['system'])) 
+			? \App::$config['system']['smarty3_folder'] : '');
+        if (!$basecompiledir) $basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH;
+        if (!is_dir($basecompiledir)) {
 			@os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true);
-	        if (! is_dir($basecompiledir)) {
+	        if (!is_dir($basecompiledir)) {
 				echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> does not exist."; killme();
 			}
         }
-		if (! is_writable($basecompiledir)) {
+		if(!is_writable($basecompiledir)){
 			echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> must be writable by webserver."; killme();
 		}
-		App::$config['system']['smarty3_folder'] = $basecompiledir;
+         \App::$config['system']['smarty3_folder'] = $basecompiledir;
 	}
 	
 	// TemplateEngine interface
@@ -36,18 +31,18 @@ class SmartyTemplate implements TemplateEngine {
 	public function replace_macros($s, $r) {
 		$template = '';
 
-		// macro or macros available for use in all templates
+		// these are available for use in all templates
 
 		$r['$z_baseurl']     = z_root();
 		$r['$z_server_role'] = \Zotlabs\Lib\System::get_server_role();
 		$r['$z_techlevel']   = get_account_techlevel();
 
-		if (gettype($s) === 'string') {
+		if(gettype($s) === 'string') {
 			$template = $s;
 			$s = new SmartyInterface();
 		}
-		foreach ($r as $key=>$value) {
-			if ($key[0] === '$') {
+		foreach($r as $key=>$value) {
+			if($key[0] === '$') {
 				$key = substr($key, 1);
 			}
 			$s->assign($key, $value);
@@ -55,32 +50,32 @@ class SmartyTemplate implements TemplateEngine {
 		return $s->parsed($template);		
 	}
 	
-	public function get_markup_template($file, $root = '') {
+	public function get_markup_template($file, $root=''){
 		$template_file = theme_include($file, $root);
-		if ($template_file) {
+		if($template_file) {
 			$template = new SmartyInterface();
 			$template->filename = $template_file;
 
 			return $template;
 		}		
-		return EMPTY_STR;
+		return "";
 	}
 
-	public function get_intltext_template($file, $root = '') {
+	public function get_intltext_template($file, $root='') {
 
-		$lang = App::$language;
-		if ($root != '' && substr($root,-1) != '/' ) {
-			$root .= '/';
-		}
-		foreach ( [ $root . "view/$lang/$file", $root . "view/en/$file", '' ] as $template_file) {
-			if (is_file($template_file)) {
-				break;
-			}
-		}
-		if ($template_file == '') {
-			$template_file = theme_include($file,$root);
-		}
-		if ($template_file) {
+		$lang = \App::$language;
+                if ($root != '' && substr($root,-1) != '/' ) {
+                               $root .= '/';
+                }
+                foreach (Array(
+                               $root."view/$lang/$file",
+                               $root."view/en/$file",
+                               ''
+                               ) as $template_file) {
+                        if (is_file($template_file)) { break; }
+                }
+                if ($template_file=='') {$template_file = theme_include($file,$root);}
+		if($template_file) {
 			$template = new SmartyInterface();
 			$template->filename = $template_file;
 			return $template;

Zotlabs/Storage/Directory.php

@@ -720,11 +720,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 	 * @return array Directory[]
  	 */
 	function ChannelList(&$auth) {
-		$ret = [];
-
-		if (intval(get_config('system','cloud_disable_siteroot'))) {
-			return $ret;
-		}
+		$ret = array();
 
 		$r = q("SELECT channel_id, channel_address, profile.publish FROM channel left join profile on profile.uid = channel.channel_id WHERE channel_removed = 0 AND channel_system = 0 AND (channel_pageflags & %d) = 0",
 			intval(PAGE_HIDDEN)
@@ -734,7 +730,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 			foreach ($r as $rr) {
 				if (perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage') && $rr['publish']) {
 					logger('found channel: /cloud/' . $rr['channel_address'], LOGGER_DATA);
-					$ret[] = new Directory($rr['channel_address'], $auth);
+					// @todo can't we drop '/cloud'? It gets stripped off anyway in RedDirectory
+					$ret[] = new Directory('/cloud/' . $rr['channel_address'], $auth);
 				}
 			}
 		}