aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Module/Settings/Featured.php18
-rw-r--r--Zotlabs/Zot/Auth.php2
-rwxr-xr-xboot.php5
-rw-r--r--include/zid.php2
-rw-r--r--util/hmessages.po94
5 files changed, 62 insertions, 59 deletions
diff --git a/Zotlabs/Module/Settings/Featured.php b/Zotlabs/Module/Settings/Featured.php
index 4885abd1d..ebe2996d3 100644
--- a/Zotlabs/Module/Settings/Featured.php
+++ b/Zotlabs/Module/Settings/Featured.php
@@ -10,14 +10,16 @@ class Featured {
call_hooks('feature_settings_post', $_POST);
- if(intval($_POST['affinity_cmax'])) {
- set_pconfig(local_channel(),'affinity','cmax',intval($_POST['affinity_cmax']));
- }
- if(intval($_POST['affinity_cmin'])) {
- set_pconfig(local_channel(),'affinity','cmin',intval($_POST['affinity_cmin']));
- }
- if(intval($_POST['affinity_cmax']) || intval($_POST['affinity_cmin'])) {
- info( t('Affinity Slider settings updated.') . EOL);
+ if($_POST['affinity_slider-submit']) {
+ if(intval($_POST['affinity_cmax'])) {
+ set_pconfig(local_channel(),'affinity','cmax',intval($_POST['affinity_cmax']));
+ }
+ if(intval($_POST['affinity_cmin'])) {
+ set_pconfig(local_channel(),'affinity','cmin',intval($_POST['affinity_cmin']));
+ }
+ if(intval($_POST['affinity_cmax']) || intval($_POST['affinity_cmin'])) {
+ info( t('Affinity Slider settings updated.') . EOL);
+ }
}
build_sync_packet();
diff --git a/Zotlabs/Zot/Auth.php b/Zotlabs/Zot/Auth.php
index d4d3bee1d..92b0fff78 100644
--- a/Zotlabs/Zot/Auth.php
+++ b/Zotlabs/Zot/Auth.php
@@ -176,7 +176,7 @@ class Auth {
return false;
}
- $this->Debug('auth check request returned .' . print_r($j, true));
+ $this->Debug('auth check request returned ' . print_r($j, true));
if(! $j['success'])
return false;
diff --git a/boot.php b/boot.php
index 171382e0c..0ba1db8fc 100755
--- a/boot.php
+++ b/boot.php
@@ -48,8 +48,9 @@ require_once('include/xchan.php');
require_once('include/hubloc.php');
require_once('include/attach.php');
-define ( 'PLATFORM_NAME', 'hubzilla' );
-define ( 'STD_VERSION', '2.5.8' );
+define ( 'PLATFORM_NAME', 'red' );
+define ( 'STD_VERSION', '5.3.1' );
+
define ( 'ZOT_REVISION', '1.2' );
define ( 'DB_UPDATE_VERSION', 1192 );
diff --git a/include/zid.php b/include/zid.php
index f5df1c611..ee43fd7c8 100644
--- a/include/zid.php
+++ b/include/zid.php
@@ -60,7 +60,7 @@ function zid($s,$address = '') {
/**
* @FIXME checking against our own channel url is no longer reliable. We may have a lot
- * of urls attached to out channel. Should probably match against our site, since we
+ * of urls attached to our channel. Should probably match against our site, since we
* will not need to remote authenticate on our own site anyway.
*/
diff --git a/util/hmessages.po b/util/hmessages.po
index 8cb0a2dec..a11fbec7d 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -1,14 +1,14 @@
-# hubzilla
-# Copyright (C) 2012-2016 hubzilla
-# This file is distributed under the same license as the hubzilla package.
+# red
+# Copyright (C) 2012-2016 red
+# This file is distributed under the same license as the red package.
# Mike Macgirvin, 2012
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.5.8\n"
+"Project-Id-Version: 5.3.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-05 21:45-0700\n"
+"POT-Creation-Date: 2017-07-05 20:52-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -583,7 +583,7 @@ msgid "Membership on this site is by invitation only."
msgstr ""
#: ../../Zotlabs/Module/Register.php:268 ../../include/nav.php:147
-#: ../../boot.php:1572
+#: ../../boot.php:1573
msgid "Register"
msgstr ""
@@ -880,7 +880,7 @@ msgstr ""
#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:100
-#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1595
+#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1596
msgid "No"
msgstr ""
@@ -943,7 +943,7 @@ msgstr ""
#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:100
-#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1595
+#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1596
msgid "Yes"
msgstr ""
@@ -978,8 +978,8 @@ msgstr ""
#: ../../Zotlabs/Module/Settings/Oauth.php:87
#: ../../Zotlabs/Module/Settings/Account.php:118
#: ../../Zotlabs/Module/Settings/Channel.php:476
-#: ../../Zotlabs/Module/Settings/Featured.php:50
#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Module/Settings/Featured.php:52
#: ../../Zotlabs/Module/Settings/Tokens.php:168
#: ../../Zotlabs/Module/Settings/Permcats.php:110
#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
@@ -5443,7 +5443,7 @@ msgid ""
"Password reset failed."
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1599
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1600
msgid "Password Reset"
msgstr ""
@@ -6590,30 +6590,6 @@ msgstr ""
msgid "Start calendar week on Monday"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:20
-msgid "Affinity Slider settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:34
-msgid "No feature settings configured"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:41
-msgid "Default maximum affinity level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:46
-msgid "Default minimum affinity level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:50
-msgid "Affinity Slider Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:60
-msgid "Feature/Addon Settings"
-msgstr ""
-
#: ../../Zotlabs/Module/Settings/Display.php:145
msgid "No special theme for mobile devices"
msgstr ""
@@ -6727,6 +6703,30 @@ msgstr ""
msgid "Grid page max height of content (in pixels)"
msgstr ""
+#: ../../Zotlabs/Module/Settings/Featured.php:21
+msgid "Affinity Slider settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:36
+msgid "No feature settings configured"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:43
+msgid "Default maximum affinity level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:48
+msgid "Default minimum affinity level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:52
+msgid "Affinity Slider Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:62
+msgid "Feature/Addon Settings"
+msgstr ""
+
#: ../../Zotlabs/Module/Settings/Tokens.php:31
#, php-format
msgid "This channel is limited to %d tokens"
@@ -7894,7 +7894,7 @@ msgid "Suggest Channels"
msgstr ""
#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:115
-#: ../../boot.php:1591
+#: ../../boot.php:1592
msgid "Login"
msgstr ""
@@ -11251,7 +11251,7 @@ msgstr ""
msgid "YYYY-MM-DD or MM-DD"
msgstr ""
-#: ../../include/datetime.php:286 ../../boot.php:2419
+#: ../../include/datetime.php:286 ../../boot.php:2420
msgid "never"
msgstr ""
@@ -11683,7 +11683,7 @@ msgstr ""
msgid "Click to authenticate to your home hub"
msgstr ""
-#: ../../include/nav.php:101 ../../include/nav.php:125 ../../boot.php:1590
+#: ../../include/nav.php:101 ../../include/nav.php:125 ../../boot.php:1591
msgid "Logout"
msgstr ""
@@ -13350,44 +13350,44 @@ msgstr ""
msgid "Set size of followup author photos"
msgstr ""
-#: ../../boot.php:1571
+#: ../../boot.php:1572
msgid "Create an account to access services and applications"
msgstr ""
-#: ../../boot.php:1593
+#: ../../boot.php:1594
msgid "Login/Email"
msgstr ""
-#: ../../boot.php:1594
+#: ../../boot.php:1595
msgid "Password"
msgstr ""
-#: ../../boot.php:1595
+#: ../../boot.php:1596
msgid "Remember me"
msgstr ""
-#: ../../boot.php:1598
+#: ../../boot.php:1599
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:2136
+#: ../../boot.php:2137
msgid "toggle mobile"
msgstr ""
-#: ../../boot.php:2289
+#: ../../boot.php:2290
#, php-format
msgid "[$Projectname] Website SSL error for %s"
msgstr ""
-#: ../../boot.php:2294
+#: ../../boot.php:2295
msgid "Website SSL certificate is not valid. Please correct."
msgstr ""
-#: ../../boot.php:2413
+#: ../../boot.php:2414
#, php-format
msgid "[$Projectname] Cron tasks not running on %s"
msgstr ""
-#: ../../boot.php:2418
+#: ../../boot.php:2419
msgid "Cron/Scheduled tasks not running."
msgstr ""