Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents aedc559 + 6fa4067 commit fd518dc76051cfa0b3b9f71f90a11ed208b5e4d3 @fplanque fplanque committed Jan 12, 2017
Showing with 43,299 additions and 21,852 deletions.
  1. +672 −668 _transifex/messages.pot
  2. +1 −1 bower.json
  3. +10 −4 conf/_advanced.php
  4. +3 −3 conf/_application.php
  5. +8 −12 htsrv/anon_async.php
  6. +83 −23 htsrv/async.php
  7. +10 −2 htsrv/login.php
  8. +6 −0 htsrv/quick_unsubscribe.php
  9. +2 −2 inc/_core/__core.init.php
  10. +45 −25 inc/_core/_misc.funcs.php
  11. +1 −1 inc/_core/model/__core.install.php
  12. +48 −9 inc/_core/model/_pagecache.class.php
  13. +1 −1 inc/_core/model/db/_db.class.php
  14. +5 −11 inc/_core/model/db/_upgrade.funcs.php
  15. +25 −1 inc/_core/ui/forms/_form.class.php
  16. +1,063 −0 inc/_ext/phpwhois/CHANGES
  17. +53 −0 inc/_ext/phpwhois/FAQ
  18. +356 −0 inc/_ext/phpwhois/HANDLERS
  19. +340 −0 inc/_ext/phpwhois/LICENSE
  20. +211 −0 inc/_ext/phpwhois/README
  21. +40 −0 inc/_ext/phpwhois/handler.template.php
  22. +1 −0 inc/_ext/phpwhois/npdata.ser
  23. +129 −0 inc/_ext/phpwhois/test.txt
  24. +213 −0 inc/_ext/phpwhois/testsuite.php
  25. +58 −0 inc/_ext/phpwhois/whois.ae.php
  26. +45 −0 inc/_ext/phpwhois/whois.aero.php
  27. +45 −0 inc/_ext/phpwhois/whois.ag.php
  28. +44 −0 inc/_ext/phpwhois/whois.asia.php
  29. +102 −0 inc/_ext/phpwhois/whois.at.php
  30. +63 −0 inc/_ext/phpwhois/whois.au.php
  31. +76 −0 inc/_ext/phpwhois/whois.be.php
  32. +45 −0 inc/_ext/phpwhois/whois.biz.php
  33. +84 −0 inc/_ext/phpwhois/whois.br.php
  34. +76 −0 inc/_ext/phpwhois/whois.ca.php
  35. +47 −0 inc/_ext/phpwhois/whois.cat.php
  36. +82 −0 inc/_ext/phpwhois/whois.ch.php
  37. +56 −0 inc/_ext/phpwhois/whois.cl.php
  38. +598 −0 inc/_ext/phpwhois/whois.client.php
  39. +91 −0 inc/_ext/phpwhois/whois.cn.php
  40. +43 −0 inc/_ext/phpwhois/whois.co.php
  41. +73 −0 inc/_ext/phpwhois/whois.co.za.php
  42. +106 −0 inc/_ext/phpwhois/whois.coop.php
  43. +73 −0 inc/_ext/phpwhois/whois.cz.php
  44. +78 −0 inc/_ext/phpwhois/whois.de.php
  45. +62 −0 inc/_ext/phpwhois/whois.edu.php
  46. +85 −0 inc/_ext/phpwhois/whois.eu.php
  47. +57 −0 inc/_ext/phpwhois/whois.fi.php
  48. +67 −0 inc/_ext/phpwhois/whois.fj.php
  49. +80 −0 inc/_ext/phpwhois/whois.fm.php
  50. +78 −0 inc/_ext/phpwhois/whois.fr.php
  51. +51 −0 inc/_ext/phpwhois/whois.gtld.afternic.php
  52. +49 −0 inc/_ext/phpwhois/whois.gtld.alldomains.php
  53. +51 −0 inc/_ext/phpwhois/whois.gtld.ascio.php
  54. +51 −0 inc/_ext/phpwhois/whois.gtld.assorted.php
  55. +53 −0 inc/_ext/phpwhois/whois.gtld.corporatedomains.php
  56. +53 −0 inc/_ext/phpwhois/whois.gtld.directnic.php
  57. +51 −0 inc/_ext/phpwhois/whois.gtld.domaindiscover.php
  58. +59 −0 inc/_ext/phpwhois/whois.gtld.domainpeople.php
  59. +53 −0 inc/_ext/phpwhois/whois.gtld.dotster.php
  60. +54 −0 inc/_ext/phpwhois/whois.gtld.dreamhost.php
  61. +62 −0 inc/_ext/phpwhois/whois.gtld.enom.php
  62. +54 −0 inc/_ext/phpwhois/whois.gtld.fabulous.php
  63. +78 −0 inc/_ext/phpwhois/whois.gtld.fastdomain.php
  64. +56 −0 inc/_ext/phpwhois/whois.gtld.gandi.php
  65. +40 −0 inc/_ext/phpwhois/whois.gtld.genericb.php
  66. +56 −0 inc/_ext/phpwhois/whois.gtld.godaddy.php
  67. +51 −0 inc/_ext/phpwhois/whois.gtld.iana.php
  68. +80 −0 inc/_ext/phpwhois/whois.gtld.interdomain.php
  69. +52 −0 inc/_ext/phpwhois/whois.gtld.itsyourdomain.php
  70. +78 −0 inc/_ext/phpwhois/whois.gtld.joker.php
  71. +55 −0 inc/_ext/phpwhois/whois.gtld.markmonitor.php
  72. +59 −0 inc/_ext/phpwhois/whois.gtld.melbourneit.php
  73. +52 −0 inc/_ext/phpwhois/whois.gtld.moniker.php
  74. +53 −0 inc/_ext/phpwhois/whois.gtld.namejuice.php
  75. +70 −0 inc/_ext/phpwhois/whois.gtld.nameking.php
  76. +54 −0 inc/_ext/phpwhois/whois.gtld.names4ever.php
  77. +52 −0 inc/_ext/phpwhois/whois.gtld.namevault.php
  78. +50 −0 inc/_ext/phpwhois/whois.gtld.networksolutions.php
  79. +62 −0 inc/_ext/phpwhois/whois.gtld.nicco.php
  80. +51 −0 inc/_ext/phpwhois/whois.gtld.nicline.php
  81. +83 −0 inc/_ext/phpwhois/whois.gtld.onlinenic.php
  82. +58 −0 inc/_ext/phpwhois/whois.gtld.opensrs.php
  83. +51 −0 inc/_ext/phpwhois/whois.gtld.ovh.php
  84. +81 −0 inc/_ext/phpwhois/whois.gtld.php
  85. +90 −0 inc/_ext/phpwhois/whois.gtld.psiusa.php
  86. +57 −0 inc/_ext/phpwhois/whois.gtld.publicdomainregistry.php
  87. +62 −0 inc/_ext/phpwhois/whois.gtld.register.php
  88. +92 −0 inc/_ext/phpwhois/whois.gtld.rrpproxy.php
  89. +86 −0 inc/_ext/phpwhois/whois.gtld.schlund.php
  90. +51 −0 inc/_ext/phpwhois/whois.gtld.srsplus.php
  91. +52 −0 inc/_ext/phpwhois/whois.gtld.tmagnic.php
  92. +50 −0 inc/_ext/phpwhois/whois.gtld.tvcorp.php
  93. +52 −0 inc/_ext/phpwhois/whois.gtld.wildwestdomains.php
  94. +95 −0 inc/_ext/phpwhois/whois.hu.php
  95. BIN inc/_ext/phpwhois/whois.icon.png
  96. +971 −0 inc/_ext/phpwhois/whois.idna.php
  97. +64 −0 inc/_ext/phpwhois/whois.ie.php
  98. +45 −0 inc/_ext/phpwhois/whois.in.php
  99. +45 −0 inc/_ext/phpwhois/whois.info.php
  100. +44 −0 inc/_ext/phpwhois/whois.int.php
  101. +77 −0 inc/_ext/phpwhois/whois.ip.afrinic.php
  102. +122 −0 inc/_ext/phpwhois/whois.ip.apnic.php
  103. +78 −0 inc/_ext/phpwhois/whois.ip.arin.php
  104. +112 −0 inc/_ext/phpwhois/whois.ip.krnic.php
  105. +79 −0 inc/_ext/phpwhois/whois.ip.lacnic.php
  106. +120 −0 inc/_ext/phpwhois/whois.ip.lib.php
  107. +285 −0 inc/_ext/phpwhois/whois.ip.php
  108. +85 −0 inc/_ext/phpwhois/whois.ip.ripe.php
  109. +60 −0 inc/_ext/phpwhois/whois.ir.php
  110. +69 −0 inc/_ext/phpwhois/whois.is.php
  111. +78 −0 inc/_ext/phpwhois/whois.it.php
  112. +111 −0 inc/_ext/phpwhois/whois.jp.php
  113. +64 −0 inc/_ext/phpwhois/whois.lt.php
  114. +78 −0 inc/_ext/phpwhois/whois.lu.php
  115. +72 −0 inc/_ext/phpwhois/whois.ly.php
  116. +331 −0 inc/_ext/phpwhois/whois.main.php
  117. +45 −0 inc/_ext/phpwhois/whois.me.php
  118. +47 −0 inc/_ext/phpwhois/whois.mobi.php
  119. +45 −0 inc/_ext/phpwhois/whois.museum.php
  120. +70 −0 inc/_ext/phpwhois/whois.mx.php
  121. +45 −0 inc/_ext/phpwhois/whois.name.php
  122. +88 −0 inc/_ext/phpwhois/whois.nl.php
  123. +90 −0 inc/_ext/phpwhois/whois.nu.php
  124. +102 −0 inc/_ext/phpwhois/whois.nz.php
  125. +47 −0 inc/_ext/phpwhois/whois.org.php
  126. +64 −0 inc/_ext/phpwhois/whois.org.za.php
  127. +873 −0 inc/_ext/phpwhois/whois.parser.php
  128. +54 −0 inc/_ext/phpwhois/whois.pl.php
  129. +43 −0 inc/_ext/phpwhois/whois.pro.php
  130. +81 −0 inc/_ext/phpwhois/whois.pt.php
  131. +99 −0 inc/_ext/phpwhois/whois.ro.php
  132. +63 −0 inc/_ext/phpwhois/whois.ru.php
  133. +58 −0 inc/_ext/phpwhois/whois.rwhois.php
  134. +45 −0 inc/_ext/phpwhois/whois.sc.php
  135. +58 −0 inc/_ext/phpwhois/whois.se.php
  136. +252 −0 inc/_ext/phpwhois/whois.servers.php
  137. +55 −0 inc/_ext/phpwhois/whois.si.php
  138. +63 −0 inc/_ext/phpwhois/whois.su.php
  139. +45 −0 inc/_ext/phpwhois/whois.tel.php
  140. +43 −0 inc/_ext/phpwhois/whois.travel.php
  141. +72 −0 inc/_ext/phpwhois/whois.uk.php
  142. +44 −0 inc/_ext/phpwhois/whois.us.php
  143. +152 −0 inc/_ext/phpwhois/whois.utils.php
  144. +75 −0 inc/_ext/phpwhois/whois.ve.php
  145. +76 −0 inc/_ext/phpwhois/whois.ws.php
  146. +90 −0 inc/_ext/phpwhois/whois.zanet.php
  147. +1 −1 inc/antispam/model/_antispam.funcs.php
  148. +20 −10 inc/antispam/views/_antispam_ban.form.php
  149. +12 −3 inc/collections/_demo_content.funcs.php
  150. +8 −2 inc/collections/model/_blog.class.php
  151. +88 −10 inc/collections/model/_blog.funcs.php
  152. +2 −0 inc/collections/views/_coll_urls.form.php
  153. +98 −5 inc/comments/model/_comment.class.php
  154. +2 −2 inc/comments/model/_comment.funcs.php
  155. +15 −5 inc/comments/model/_comment_js.funcs.php
  156. +1 −1 inc/cron/views/_cronjob.view.php
  157. +1 −1 inc/dashboard/model/_dashboard.funcs.php
  158. +1 −1 inc/email_campaigns/views/_campaigns_send.form.php
  159. +13 −13 inc/files/files.ctrl.php
  160. +10 −3 inc/files/model/_file.class.php
  161. +9 −8 inc/files/model/_file.funcs.php
  162. +3 −2 inc/files/views/_file_browse.view.php
  163. +5 −2 inc/items/items.ctrl.php
  164. +96 −82 inc/items/model/_item.class.php
  165. +76 −21 inc/items/model/_item.funcs.php
  166. +14 −12 inc/items/views/_item_list_full.view.php
  167. +25 −1 inc/items/views/_item_list_table.view.php
  168. +6 −3 inc/items/views/_itemtype.form.php
  169. +8 −1 inc/links/model/_linkowner.class.php
  170. +1 −1 inc/messaging/model/_message.class.php
  171. +4 −3 inc/messaging/views/_thread.form.php
  172. +1 −1 inc/plugins/_plugin.funcs.php
  173. +4 −3 inc/sessions/views/_stats_sessions_list.view.php
  174. +1 −0 inc/settings/model/_generalsettings.class.php
  175. +1 −0 inc/skins/_skin.funcs.php
  176. +249 −119 inc/tools/model/_phpbb.funcs.php
  177. +2 −0 inc/tools/phpbbimport.ctrl.php
  178. +1 −1 inc/tools/views/_misc_import.view.php
  179. +4 −3 inc/tools/views/_phpbb_config.form.php
  180. +3 −2 inc/tools/views/_phpbb_forums.form.php
  181. +7 −5 inc/tools/views/_phpbb_groups.form.php
  182. +3 −2 inc/tools/views/_phpbb_messages.form.php
  183. +3 −2 inc/tools/views/_phpbb_replies.form.php
  184. +3 −2 inc/tools/views/_phpbb_topics.form.php
  185. +3 −2 inc/tools/views/_phpbb_users.form.php
  186. +13 −9 inc/users/model/_user.class.php
  187. +57 −42 inc/users/model/_user.funcs.php
  188. +1 −0 inc/users/model/_userfield.class.php
  189. +1 −0 inc/users/model/_usersettings.class.php
  190. +44 −0 inc/users/organizations.ctrl.php
  191. +2 −0 inc/users/registration.ctrl.php
  192. +1 −1 inc/users/views/_display.form.php
  193. +45 −0 inc/users/views/_organization_user_remove.form.php
  194. +1 −0 inc/users/views/_registration.form.php
  195. +4 −2 inc/users/views/_user_activity.view.php
  196. +32 −3 inc/users/views/_user_admin.form.php
  197. +3 −3 inc/users/views/_user_advanced.form.php
  198. +2 −2 inc/users/views/_user_avatar.form.php
  199. +3 −3 inc/users/views/_user_identity.form.php
  200. +2 −2 inc/users/views/_user_password.form.php
  201. +2 −2 inc/users/views/_user_preferences.form.php
  202. +3 −2 inc/users/views/_user_subscriptions.form.php
  203. +1 −1 inc/widgets/widgets/_coll_comment_list.widget.php
  204. +9 −0 inc/widgets/widgets/_coll_tag_cloud.widget.php
  205. +1 −1 inc/widgets/widgets/_item_seen_by.widget.php
  206. +2 −2 inc/widgets/widgets/_user_avatars.widget.php
  207. +40 −23 install/_functions_evoupgrade.php
  208. +15 −5 install/_functions_install.php
  209. +2 −1 install/automated-install.html
  210. +71 −48 install/index.php
  211. +1,282 −1,317 locales/de_DE/LC_MESSAGES/messages.po
  212. +3 −41 locales/de_DE/_global.php
  213. +723 −705 locales/fr_FR/LC_MESSAGES/messages.po
  214. +44 −1 locales/fr_FR/_global.php
  215. +672 −668 locales/messages.pot
  216. +1,312 −1,309 locales/ru_RU/LC_MESSAGES/messages.po
  217. +42 −41 locales/ru_RU/_global.php
  218. +1 −1 package.json
  219. +9 −0 plugins/_autolinks.plugin.php
  220. +2 −1 plugins/test_plugin/_test.plugin.php
  221. +1 −1 readme.html
  222. +1 −1 readme.md
  223. +1 −1 rsc/build/bootstrap-b2evo_base.bmin.css
  224. +32 −2 rsc/build/bootstrap-b2evo_base.bundle.css
  225. +1 −1 rsc/build/bootstrap-backoffice-b2evo_base.bmin.css
  226. +32 −2 rsc/build/bootstrap-backoffice-b2evo_base.bundle.css
  227. BIN rsc/css/jquery/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
  228. BIN rsc/css/jquery/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
  229. BIN rsc/css/jquery/smoothness/images/ui-bg_glass_75_dadada_1x400.png
  230. BIN rsc/css/jquery/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
  231. BIN rsc/css/jquery/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
  232. BIN rsc/css/jquery/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  233. BIN rsc/css/jquery/smoothness/images/ui-icons_222222_256x240.png
  234. BIN rsc/css/jquery/smoothness/images/ui-icons_2e83ff_256x240.png
  235. BIN rsc/css/jquery/smoothness/images/ui-icons_454545_256x240.png
  236. BIN rsc/css/jquery/smoothness/images/ui-icons_888888_256x240.png
  237. BIN rsc/css/jquery/smoothness/images/ui-icons_cd0a0a_256x240.png
  238. +153 −115 rsc/css/jquery/smoothness/jquery-ui.b2evo.css
  239. +5 −5 rsc/css/jquery/smoothness/jquery-ui.b2evo.min.css
  240. +1,105 −282 rsc/css/jquery/smoothness/jquery-ui.css
  241. +7 −0 rsc/css/jquery/smoothness/jquery-ui.min.css
  242. +44 −8 rsc/js/bootstrap/formfields.js
  243. +8 −1 rsc/js/bootstrap/usernames.js
  244. +2 −2 rsc/js/build/bootstrap-evo_backoffice.bmin.js
  245. +1 −1 rsc/js/build/bootstrap-evo_frontoffice.bmin.js
  246. +2 −2 rsc/js/build/evo_backoffice.bmin.js
  247. +1 −1 rsc/js/build/popover.bmin.js
  248. +11 −0 rsc/js/form_extensions.js
  249. +2,707 −2,007 rsc/js/jquery.js
  250. +5 −4 rsc/js/jquery.min.js
  251. +12,026 −8,328 rsc/js/jquery/jquery.ui.all.js
  252. +11 −5 rsc/js/jquery/jquery.ui.all.min.js
  253. +7,027 −5,641 rsc/js/jquery/jquery.ui.b2evo.js
  254. +8 −5 rsc/js/jquery/jquery.ui.b2evo.min.js
  255. +28 −1 rsc/js/src/bootstrap-evo_modal_window.js
  256. +27 −0 rsc/js/src/evo_user_org.js
  257. +4 −4 rsc/less/basic_styles.less
  258. +1 −1 rsc/less/blog_base.less
  259. +1 −1 rsc/less/bootstrap-basic.less
  260. +1 −1 rsc/less/bootstrap-blog_base.less
  261. +34 −1 rsc/less/bootstrap-evoskins.less
  262. +1 −1 skins/bootstrap_blog_skin/_skin.class.php
  263. +45 −36 skins/bootstrap_forums_skin/_item_block.inc.php
  264. +8 −5 skins/bootstrap_forums_skin/_item_comment.inc.php
  265. +4 −0 skins/bootstrap_forums_skin/_item_list.inc.php
  266. +1 −1 skins/bootstrap_forums_skin/_skin.class.php
  267. +60 −2 skins/bootstrap_forums_skin/style.css
  268. +62 −7 skins/bootstrap_forums_skin/style.less
  269. +1 −1 skins/bootstrap_forums_skin/style.min.css
  270. +1 −1 skins/bootstrap_gallery_legacy/_skin.class.php
  271. +1 −1 skins/bootstrap_gallery_skin/_skin.class.php
  272. +1 −1 skins/bootstrap_main_skin/_skin.class.php
  273. +1 −1 skins/bootstrap_manual_skin/_skin.class.php
  274. +1 −1 skins/bootstrap_manual_skin/left_navigation.js
  275. +1 −1 skins/bootstrap_photoblog_skin/_skin.class.php
  276. +1 −0 skins_adm/bootstrap/_adminUI.class.php
  277. +8 −3 skins_adm/bootstrap/rsc/css/style.css
  278. +10 −4 skins_adm/bootstrap/rsc/css/style.less
  279. +1 −1 skins_adm/bootstrap/rsc/css/style.min.css
  280. +1 −1 skins_email/_email_header.inc.html.php
  281. +1 −1 skins_email/_email_header.inc.txt.php
  282. +2 −2 skins_email/account_changed.html.php
  283. +1 −1 skins_email/account_changed.txt.php
  284. +1 −1 skins_email/account_closed.html.php
  285. +1 −1 skins_email/account_new.html.php
  286. +1 −1 skins_email/account_reported.html.php
  287. +1 −1 skins_email/comment_new.html.php
  288. +119 −0 skins_email/comment_spam.html.php
  289. +121 −0 skins_email/comment_spam.txt.php
  290. +1 −1 skins_email/post_new.html.php
  291. +4 −4 skins_email/post_new.txt.php
  292. +1 −1 skins_email/posts_unmoderated_reminder.html.php
  293. +3 −3 skins_email/private_message_new.html.php
  294. +3 −3 skins_email/private_message_new.txt.php
  295. +1 −1 skins_fallback_v5/_edit.disp.php
  296. +14 −2 skins_fallback_v6/_edit.disp.php
  297. +8 −1 skins_fallback_v6/_edit_comment.disp.php
  298. +5 −2 skins_fallback_v6/_item_comment_form.inc.php
View
Oops, something went wrong.
View
@@ -1,6 +1,6 @@
{
"name": "b2evolution",
- "version": "6.8.2-stable",
+ "version": "6.8.3-stable",
"description": "Multiblog/CMS + user community + email marketing + social network + everything you need to run and maintain a modern website (PHP/MySQL).",
"devDependencies": {
"jquery": ">=1.11.1",
View
@@ -160,7 +160,7 @@
* By default images get copied into b2evo cache without resampling if they are smaller
* than requested thumbnails.
*
- * If you want to use the BeforeThumbCreate event (Watermark plugin), this should be set to 'true'
+ * If you want to use the BeforeThumbCreate event (Watermark plugin), this should be set to 'true'
* to make sure that smaller images are also processed.
*
* @global boolean Default: false
@@ -268,7 +268,7 @@
*
* This applies only to the backoffice. For the frontoffice, the URL will be dynamically generated by function get_cookie_domain()
*
- * We'll take {@link $basehost} by default (the leading dot includes subdomains), but if there is no dot in it, at least (old?) Firefox will not set the cookie.
+ * We'll take {@link $basehost} by default (the leading dot includes subdomains), but if there is no dot in it, at least (old?) Firefox will not set the cookie.
* The most common example for having no dot in the host name is 'localhost', but it's the case for host names in an intranet also.
*
* Note: ".domain.com" cookies will be sent to sub.domain.com too.
@@ -294,7 +294,7 @@
$cookie_domain = $basehost;
}
else
-{
+{
// Keep the part of the basehost after the www. :
// $cookie_domain = preg_replace( '/^(www\. )? (.+)$/xi', '.$2', $basehost );
}
@@ -884,7 +884,7 @@
'#jqueryUI_css#' => array( 'jquery/smoothness/jquery-ui.b2evo.min.css', 'jquery/smoothness/jquery-ui.b2evo.css' ),
# Uncomment the following lines if your plugins need more jQueryUI features than the ones loaded by b2evo:
# '#jqueryUI#' => array( 'jquery/jquery.ui.all.min.js', 'jquery/jquery.ui.all.js' ),
-# '#jqueryUI_css#' => array( 'jquery/smoothness/jquery-ui.css' ),
+# '#jqueryUI_css#' => array( 'jquery/smoothness/jquery-ui.min.css', 'jquery/smoothness/jquery-ui.css' ),
'#bootstrap#' => array( 'bootstrap/bootstrap.min.js', 'bootstrap/bootstrap.js' ),
'#bootstrap_css#' => array( 'bootstrap/bootstrap.min.css', 'bootstrap/bootstrap.css' ),
'#bootstrap_theme_css#' => array( 'bootstrap/bootstrap-theme.min.css', 'bootstrap/bootstrap-theme.css' ),
@@ -916,6 +916,12 @@
/**
+ * Allow to send outbound pings on localhost
+ */
+$allow_post_pings_on_localhost = false;
+
+
+/**
* Proxy configuration for all outgoing connections (like pinging b2evolution.net or twitter, etc...)
* Leave empty if you don't want to use a proxy.
*/
@@ -15,13 +15,13 @@
* Note: This has to be compatible with {@link http://us2.php.net/en/version-compare}.
* @global string
*/
-$app_version = '6.8.2-stable';
+$app_version = '6.8.3-stable';
/**
* Release date (ISO)
* @global string
*/
-$app_date = '2016-11-17';
+$app_date = '2017-01-11';
/**
* Long version string for checking differences
@@ -36,7 +36,7 @@
*
* {@internal Before changing this in CVS, it should be discussed! }}
*/
-$new_db_version = 12130;
+$new_db_version = 12135;
/**
* Minimum PHP version required for b2evolution to function properly. It will contain each module own minimum PHP version as well.
View
@@ -34,6 +34,9 @@
// Initialize this array in order to don't load JS files twice in they have been already loaded on parent page:
$required_js = param( 'required_js', 'array:string', array(), false, true );
+// Send the predefined cookies:
+evo_sendcookies();
+
// Make sure the async responses are never cached:
header_nocache();
header_content_type( 'text/html', $io_charset );
@@ -209,7 +212,7 @@
$height = $thumbnail_sizes[$avatar_size][2];
// Display user avatar with login
// Attributes 'w' & 'h' we use for following js-scale div If image is downloading first time (Fix bubbletip)
- echo '<div class="center" w="'.$width.'" h="'.$height.'">';
+ echo '<div class="center" w="'.$width.'" h="'.$height.'" style="min-height: '.( $height + 20 ).'px; min-width: '.$width.'px;">';
echo get_avatar_imgtag( $User->login, 'login', true, $avatar_size, 'avatar_above_login', '', $avatar_overlay_text, $link_class, true, '' );
echo '</div>';
@@ -378,8 +381,11 @@
break;
}
+ // Update a vote of the comment for current User:
$edited_Comment->set_vote( 'spam', param( 'vote', 'string' ) );
$edited_Comment->dbupdate();
+
+ // Display a panel for next spam voting:
$edited_Comment->vote_spam( '', '', '&amp;', true, true, array(
'display' => true,
'button_group_class' => button_class( 'group' ).( is_admin_page() ? ' btn-group-sm' : '' ),
@@ -1057,22 +1063,12 @@
$item_ID = param( 'itemid', 'integer' );
$currentpage = param( 'currentpage', 'integer', 1 );
- if( strlen($statuses) > 2 )
- {
- $statuses = substr( $statuses, 1, strlen($statuses) - 2 );
- }
- $status_list = explode( ',', $statuses );
- if( $status_list == NULL )
- {
- $status_list = get_visibility_statuses( 'keys', array( 'redirected', 'trash' ) );
- }
-
// In case of comments_fullview we must set a filterset name to be abble to restore filterset.
// If $moderation is not NULL, then this requests came from the comments_fullview
// TODO: asimo> This should be handled with a better solution
$filterset_name = ( $item_ID > 0 ) ? '' : 'fullview';
- echo_item_comments( $blog, $item_ID, $status_list, $currentpage, $limit, array(), $filterset_name, $expiry_status );
+ echo_item_comments( $blog, $item_ID, $statuses, $currentpage, $limit, array(), $filterset_name, $expiry_status );
}
elseif( $request_from == 'front' )
{ // AJAX request goes from frontoffice
View
@@ -44,6 +44,9 @@
require $adminskins_path.'_access_denied.main.php';
}
+// Send the predefined cookies:
+evo_sendcookies();
+
// Make sure the async responses are never cached:
header_nocache();
header_content_type( 'text/html', $io_charset );
@@ -75,6 +78,51 @@
// output only a small part of what the "real controller" does..
switch( $action )
{
+ case 'get_whois_info':
+ param( 'query', 'string' );
+ param( 'window_height', 'integer' );
+
+ load_class('_ext/phpwhois/whois.main.php', 'whois' );
+
+ $whois = new Whois();
+
+ // Set to true if you want to allow proxy requests
+ $allowproxy = false;
+
+ // get faster but less acurate results
+ $whois->deep_whois = empty( $_GET['fast'] );
+
+ // To use special whois servers (see README)
+ //$whois->UseServer( 'uk', 'whois.nic.uk:1043?{hname} {ip} {query}' );
+ //$whois->UseServer( 'au', 'whois-check.ausregistry.net.au' );
+
+ // Comment the following line to disable support for non ICANN tld's
+ $whois->non_icann = true;
+
+ $result = $whois->Lookup( $query );
+
+ $winfo = '<pre style="height: '.( $window_height - 200 ).'px; overflow: auto;">';
+ if( ! empty( $result['rawdata'] ) )
+ {
+ // Highlight lines starting with orgname: or org-name: (case insensitive)
+ for( $i = 0; $i < count( $result['rawdata'] ); $i++ )
+ {
+ if( preg_match( '/^(orgname:|org-name:)/i', $result['rawdata'][$i] ) )
+ {
+ $result['rawdata'][$i] = '<span style="font-weight: bold; background-color: yellow;">'.$result['rawdata'][$i].'</span>';
+ }
+ }
+ $winfo .= format_to_output( implode( $result['rawdata'], "\n" ) );
+ }
+ else
+ {
+ $winfo = format_to_output( implode( $whois->Query['errstr'], "\n" ) )."<br></br>";
+ }
+ $winfo .= '</pre>';
+
+ echo $winfo;
+ break;
+
case 'add_plugin_sett_set':
// Dislay a new Plugin(User)Settings set ( it's used only from plugins with "array" type settings):
@@ -368,23 +416,14 @@
}
if( in_array( $request_from, array( 'items', 'comments' ) ) )
- { // AJAX request goes from backoffice and ctrl = items or comments
- if( strlen($statuses) > 2 )
- {
- $statuses = substr( $statuses, 1, strlen($statuses) - 2 );
- }
- $status_list = explode( ',', $statuses );
- if( $status_list == NULL )
- {
- $status_list = get_visibility_statuses( 'keys', array( 'redirected', 'trash' ) );
- }
+ { // AJAX request goes from backoffice and ctrl = items or comments:
// In case of comments_fullview we must set a filterset name to be abble to restore filterset.
// If $item_ID is not valid, then this requests came from the comments_fullview
// TODO: asimo> This should be handled with a better solution
$filterset_name = /*'';*/( $item_ID > 0 ) ? '' : 'fullview';
- echo_item_comments( $blog, $item_ID, $status_list, $currentpage, $limit, array(), $filterset_name, $expiry_status, $comment_type );
+ echo_item_comments( $blog, $item_ID, $statuses, $currentpage, $limit, array(), $filterset_name, $expiry_status, $comment_type );
}
break;
@@ -435,18 +474,8 @@
$AdminUI = new AdminUI();
if( in_array( $request_from, array( 'items', 'comments' ) ) )
- { // AJAX request goes from backoffice and ctrl = items or comments
- if( strlen($statuses) > 2 )
- {
- $statuses = substr( $statuses, 1, strlen($statuses) - 2 );
- }
- $status_list = explode( ',', $statuses );
- if( $status_list == NULL )
- { // init statuses
- $status_list = get_visibility_statuses( 'keys', array( 'redirected', 'trash' ) );
- }
-
- echo_item_comments( $blog, $item_ID, $status_list, $currentpage, NULL, array(), '', $expiry_status, $comment_type );
+ { // AJAX request goes from backoffice and ctrl = items or comments
+ echo_item_comments( $blog, $item_ID, $statuses, $currentpage, NULL, array(), '', $expiry_status, $comment_type );
}
elseif( $request_from == 'dashboard' || $request_from == 'coll_settings' )
{ // AJAX request goes from backoffice dashboard
@@ -683,6 +712,37 @@
echo '<a href="#" rel="'.$new_value.'"'.$new_attrs.'>'.$new_title.'</a>';
break;
+ case 'item_order_edit':
+ // Update an order of Item from list screen by clicking on the cell:
+
+ // Check that this action request is not a CSRF hacked request:
+ $Session->assert_received_crumb( 'itemorder' );
+
+ $item_order = param( 'new_item_order', 'string' );
+ $post_ID = param( 'post_ID', 'integer' );
+
+ $ItemCache = & get_ItemCache();
+ $Item = & $ItemCache->get_by_ID( $post_ID );
+
+ // Check permission:
+ $current_User->check_perm( 'item_post!CURSTATUS', 'edit', true, $Item );
+
+ if( $item_order === '-' || $item_order === '' )
+ { // Set NULL for these values:
+ $item_order = NULL;
+ }
+ else
+ { // Make an order to integer:
+ $item_order = intval( $item_order );
+ }
+
+ $Item->set( 'order', $item_order, true );
+ $Item->dbupdate();
+
+ // Return a link to make the cell editable on next time:
+ echo '<a href="#" rel="'.$Item->ID.'">'.( $item_order === NULL ? '-' : $item_order ).'</a>';
+ break;
+
case 'cat_order_edit':
// Update order of a chapter from list screen by clicking on the order column
View
@@ -374,8 +374,16 @@
if( $User->check_status( 'is_validated' ) )
{ // Already activated, e.g. clicked on an obsolete email link:
$Messages->add( T_('Your account has already been activated.'), 'note' );
- $action = 'req_login';
- break;
+ if( is_logged_in() )
+ { // Redirect to base url if user is already logged in:
+ header_redirect( $baseurl );
+ /* exited */
+ }
+ else
+ { // Display a login form if user is not logged in yet:
+ $action = 'req_login';
+ break;
+ }
}
elseif( $User->check_status( 'is_closed' ) )
{ // Account was closed, don't let to activate the account
@@ -95,6 +95,12 @@
$UserSettings->dbupdate();
break;
+ case 'comment_moderator_spam':
+ // unsubscribe from spam comment may need moderation notifications:
+ $UserSettings->set( 'notify_spam_cmt_moderation', '0', $edited_User->ID );
+ $UserSettings->dbupdate();
+ break;
+
case 'pst_moderation_reminder':
// unsubscribe from post moderation reminder notifications
$UserSettings->set( 'send_pst_moderation_reminder', '0', $edited_User->ID );
@@ -763,13 +763,13 @@ function get_available_group_permissions( $grp_ID = NULL )
array( 'label' => T_( 'New Comment subscription notifications' ) ), $notifications_array
),
'comment_moderation_notif' => array_merge(
- array( 'label' => T_( 'New Comment moderation notifications' ) ), $notifications_array
+ array( 'label' => T_( 'Comment moderation notifications' ) ), $notifications_array
),
'post_subscription_notif' => array_merge(
array( 'label' => T_( 'New Post subscription notifications' ) ), $notifications_array
),
'post_moderation_notif' => array_merge(
- array( 'label' => T_( 'New Post moderation notifications' ) ), $notifications_array
+ array( 'label' => T_( 'Post moderation notifications' ) ), $notifications_array
),
'cross_country_allow_profiles' => array(
'label' => T_('Users'),
Oops, something went wrong.

0 comments on commit fd518dc

Please sign in to comment.