diff options
| author | zotlabs <mike@macgirvin.com> | 2016-11-10 15:59:49 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-11-10 15:59:49 -0800 |
| commit | 20497f1be30348cddc4c16f7ffa5615cc17a4225 (patch) | |
| tree | 150b3000813fc5d475c1e6c39a5c3ee0999a5c4d | |
| parent | 74947d1c1cb7c669ef2a167990066b34d89b5b07 (diff) | |
| download | volse-hubzilla-20497f1be30348cddc4c16f7ffa5615cc17a4225.tar.gz volse-hubzilla-20497f1be30348cddc4c16f7ffa5615cc17a4225.tar.bz2 volse-hubzilla-20497f1be30348cddc4c16f7ffa5615cc17a4225.zip | |
Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin on the first hop since we no longer provide the twitter api by default
| -rw-r--r-- | include/channel.php | 4 | ||||
| -rw-r--r-- | util/zotsh/README.txt | 4 | ||||
| -rw-r--r-- | util/zotsh/easywebdav/__init__.pyc | bin | 455 -> 457 bytes | |||
| -rw-r--r-- | util/zotsh/easywebdav/__version__.pyc | bin | 173 -> 174 bytes | |||
| -rw-r--r-- | util/zotsh/easywebdav/client.pyc | bin | 8846 -> 8871 bytes | |||
| -rwxr-xr-x | util/zotsh/zotsh.py | 4 |
6 files changed, 7 insertions, 5 deletions
diff --git a/include/channel.php b/include/channel.php index c02d5266e..e35f453de 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1539,11 +1539,11 @@ function remote_online_status($webbie) { */ function identity_selector() { - if (local_channel()) { + if(local_channel()) { $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ", intval(get_account_id()) ); - if (count($r) > 1) { + if($r && count($r) > 1) { //$account = App::get_account(); $o = replace_macros(get_markup_template('channel_id_select.tpl'), array( '$channels' => $r, diff --git a/util/zotsh/README.txt b/util/zotsh/README.txt index 3f31bba7f..facddc850 100644 --- a/util/zotsh/README.txt +++ b/util/zotsh/README.txt @@ -8,6 +8,8 @@ Install ZotSH requires 'requests'(1).
Please refer to requests docs on how to install it (2)
+The initially connected server must have the twitter_api plugin installed
+
Extract somewere and launch zotsh.py
@@ -106,4 +108,4 @@ Links _0 : https://github.com/amnong/easywebdav
_1 : http://docs.python-requests.org/en/latest/
-_2 : http://docs.python-requests.org/en/latest/user/install/
\ No newline at end of file +_2 : http://docs.python-requests.org/en/latest/user/install/
diff --git a/util/zotsh/easywebdav/__init__.pyc b/util/zotsh/easywebdav/__init__.pyc Binary files differindex b609b06c1..4f30c1871 100644 --- a/util/zotsh/easywebdav/__init__.pyc +++ b/util/zotsh/easywebdav/__init__.pyc diff --git a/util/zotsh/easywebdav/__version__.pyc b/util/zotsh/easywebdav/__version__.pyc Binary files differindex 5da5a28ec..b19bf50b0 100644 --- a/util/zotsh/easywebdav/__version__.pyc +++ b/util/zotsh/easywebdav/__version__.pyc diff --git a/util/zotsh/easywebdav/client.pyc b/util/zotsh/easywebdav/client.pyc Binary files differindex 4c42d2603..cf074d522 100644 --- a/util/zotsh/easywebdav/client.pyc +++ b/util/zotsh/easywebdav/client.pyc diff --git a/util/zotsh/zotsh.py b/util/zotsh/zotsh.py index d5e1aa527..36506b39d 100755 --- a/util/zotsh/zotsh.py +++ b/util/zotsh/zotsh.py @@ -55,7 +55,7 @@ class ZotSH(object): @session.setter
def session(self, session):
self._session = session
- self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="dav", verify_ssl=VERIFY_SSL)
+ self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="cloud", verify_ssl=VERIFY_SSL)
@property
def PS1(self):
@@ -205,7 +205,7 @@ class ZotSH(object): print _fmt('d', 0, "../")
for f in r:
- name = f.name.replace("/dav"+self.davclient.cwd,"")
+ name = f.name.replace("/cloud"+self.davclient.cwd,"")
type = "-"
if name.endswith("/"):
type = "d"
|