Skip to content

Commit 2f96c15

Browse files
alexmuzalexmuz
committed
system 1.0.7, new waMail (Swift Mailer), stickies and contacts updates
1 parent 4e67294 commit 2f96c15

File tree

227 files changed

+19014
-1089
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+19014
-1089
lines changed

‎LICENSE

+165
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎README

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Webasyst PHP Framework
2+
----------------------
3+
4+
Webasyst is PHP framework for creating backend and frontend applications.
5+
6+
Homepage: http://www.webasyst.com
7+
Documentation: http://www.webasyst.com/framework/docs/
8+
Repository: https://github.com/webasyst/webasyst-framework
9+
10+
Webasyst is released under the LGPL license.
11+
Copyright 2011-2012 WebAsyst LLC.

‎wa-apps/blog/js/blog.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ $.wa_blog = {
161161
},
162162
compileTemplates : function() {
163163
var pattern = /<\\\/(\w+)/g;
164-
var replace = '<\/$1';
164+
var replace = '</$1';
165165

166166
$("script[type$='x-jquery-tmpl']").each(function() {
167167
var id = $(this).attr('id').replace(/-template-js$/, '');

‎wa-apps/blog/lib/actions/backend/blogBackend.action.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public function execute()
1313
$stream = array();
1414
$search_options = array();
1515

16-
if ($blog_id = max(0,waRequest::get('blog', null, waRequest::TYPE_INT))) {
16+
if ($blog_id = max(0, waRequest::get('blog', null, waRequest::TYPE_INT))) {
1717

1818
if (!isset($blogs[$blog_id])) {
1919
throw new waException(_w('Blog not found'), 404);
@@ -38,15 +38,15 @@ public function execute()
3838

3939
$search = false;
4040

41-
if ($plugin = waRequest::get('search',false)) {
41+
if ($plugin = waRequest::get('search', false)) {
4242
if (!isset($search_options["plugin"])) {
4343
$search_options["plugin"] = array();
4444
}
45-
$search_options["plugin"][$plugin] = waRequest::get($plugin,true);
45+
$search_options["plugin"][$plugin] = waRequest::get($plugin, true);
4646
}
4747

48-
$page = max(1,waRequest::get('page', 1, waRequest::TYPE_INT));
49-
$posts_per_page = max(1,intval($this->getConfig()->getOption('posts_per_page')));
48+
$page = max(1, waRequest::get('page', 1, waRequest::TYPE_INT));
49+
$posts_per_page = max(1, intval($this->getConfig()->getOption('posts_per_page')));
5050

5151
$extend_options = array();
5252
$extend_options['status'] = true;
@@ -62,7 +62,7 @@ public function execute()
6262
if ($page == 1) {
6363
$stream['title'] = $this->getResponse()->getTitle();
6464
$this->setLayout(new blogDefaultLayout());
65-
$this->view->assign('plugin',$plugin);
65+
$this->view->assign('plugin', $plugin);
6666
}
6767

6868

@@ -78,14 +78,14 @@ public function execute()
7878
$this->view->assign('posts_total_count', $post_model->searchCount());
7979
$this->view->assign('posts_count', ($page - 1) * $posts_per_page + count($posts));
8080
$this->view->assign('posts_per_page', $posts_per_page);
81-
$this->view->assign('contact_rights',$this->getUser()->getRights('contacts','backend'));
81+
$this->view->assign('contact_rights', $this->getUser()->getRights('contacts', 'backend'));
8282
}
8383

8484
private function getUrl($blog = null)
8585
{
8686
$url = false;
8787
if (!$blog) {
88-
$urls = blogBlog::getUrl(false,true);
88+
$urls = blogBlog::getUrl(false, true);
8989
} else if (isset($blog['status']) && $blog['status'] == blogBlogModel::STATUS_PUBLIC) {
9090
$urls = blogBlog::getUrl($blog, true);
9191
}

‎wa-apps/blog/lib/actions/backend/blogBackendCalendar.action.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function execute()
5757
'user'=>false,
5858
'rights'=>true,
5959
);
60-
$posts = $post_model->search($search_options,$extend_options,array('blog'=>$blogs))->fetchSearchAll(false);
60+
$posts = $post_model->search($search_options, $extend_options, array('blog'=>$blogs))->fetchSearchAll(false);
6161

6262
$current_date_start = $date_start;
6363
$days = array();
@@ -113,10 +113,10 @@ public function execute()
113113
}
114114
$contact_where = array();
115115
if ($full) {
116-
$contact_where[] = "blog_id IN (".implode(', ',$full).")";
116+
$contact_where[] = "blog_id IN (".implode(', ', $full).")";
117117
}
118118
if ($writeable) {
119-
$contact_where[] .= "contact_id = {$this->getUser()->getId()} AND blog_id IN (".implode(', ',$writeable).")";
119+
$contact_where[] .= "contact_id = {$this->getUser()->getId()} AND blog_id IN (".implode(', ', $writeable).")";
120120
}
121121
if ($contact_where) {
122122
$search = true;

‎wa-apps/blog/lib/actions/backend/blogBackendSidebar.action.php

+26-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function execute()
2929
$blog_model = new blogBlogModel();
3030
$blogs = $blog_model->getAvailable($this->user);
3131

32-
$blogs = $blog_model->prepareView($blogs,array('new'=>true));
32+
$blogs = $blog_model->prepareView($blogs, array('new'=>true));
3333
$comment_model = new blogCommentModel();
3434
$comment_count = $comment_model->countByParam(array_keys($blogs), null, blogCommentModel::STATUS_PUBLISHED);
3535
$activity_datetime = blogHelper::getLastActivity();
@@ -54,22 +54,22 @@ public function execute()
5454

5555
if ($writable_blogs) {
5656
$post_model = new blogPostModel();
57-
$search_options = array('status' =>array(blogPostModel::STATUS_DRAFT,blogPostModel::STATUS_DEADLINE,blogPostModel::STATUS_SCHEDULED));
57+
$search_options = array('status' =>array(blogPostModel::STATUS_DRAFT, blogPostModel::STATUS_DEADLINE, blogPostModel::STATUS_SCHEDULED));
5858
if (!$this->user->isAdmin($this->getApp()) ) {
5959
$search_options['contact_id'] = $this->user->getId();
6060
}
61-
$search_options['sort'] = 'create';
61+
$search_options['sort'] = 'overdue';
6262
$drafts = $post_model->search($search_options, array(
6363
'status' => true,
6464
'link'=>false,
6565
'plugin'=>false,
6666
'comments'=>false,
6767
), array('blog' => $blogs))->fetchSearchAll(false);
6868

69-
$where = "status = '".blogPostModel::STATUS_DEADLINE."' AND datetime < '".waDateTime::date("Y-m-d")."'";
69+
$where = "status = '".blogPostModel::STATUS_DEADLINE."' AND datetime <= '".waDateTime::date("Y-m-d")."'";
7070
if (!$this->getUser()->isAdmin($this->getApp())) {
7171
$where .= " AND contact_id = {$this->getUser()->getId()}";
72-
$where .= " AND blog_id IN (".implode(', ',array_keys($blogs)).")";
72+
$where .= " AND blog_id IN (".implode(', ', array_keys($blogs)).")";
7373
}
7474
$count_overdue = $post_model->select("count(id)")->where($where)->fetchField();
7575
$count_overdue = ($count_overdue) ? $count_overdue : 0;
@@ -82,9 +82,29 @@ public function execute()
8282
* Extend backend sidebar
8383
* Add extra sidebar items (menu items, additional sections, system output)
8484
* @event backend_sidebar
85+
* @example #event handler example
86+
* public function sidebarAction()
87+
* {
88+
* $output = array();
89+
*
90+
* #add external link into sidebar menu
91+
* $output['menu']='<li>
92+
* <a href="http://www.webasyst.com">
93+
* http://www.webasyst.com
94+
* </a>
95+
* </li>';
96+
*
97+
* #add section into sidebar menu
98+
* $output['section']='';
99+
*
100+
* #add system link into sidebar menu
101+
* $output['system']='';
102+
*
103+
* return $output;
104+
* }
85105
* @return array[string][string]string $return[%plugin_id%]['menu'] Single menu items
86106
* @return array[string][string]string $return[%plugin_id%]['section'] Sections menu items
87-
* @return array[string][string]string $return[%plugin_id%]['system'] Extra menu output
107+
* @return array[string][string]string $return[%plugin_id%]['system'] Extra menu items
88108
*/
89109
$this->view->assign('backend_sidebar', wa()->event('backend_sidebar'));
90110

‎wa-apps/blog/lib/actions/blog/blogBlogDelete.controller.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ class blogBlogDeleteController extends waController
88
public function execute()
99
{
1010
if ($blog_id = (int) waRequest::post('id')) {
11-
blogHelper::checkRights($blog_id,true,blogRightConfig::RIGHT_FULL);
11+
blogHelper::checkRights($blog_id, true, blogRightConfig::RIGHT_FULL);
1212
$remove = waRequest::post('remove');
1313
if ($remove == 'move') {
1414
$move_blog_id = waRequest::post('blog_id');
1515

16-
blogHelper::checkRights($move_blog_id,true,blogRightConfig::RIGHT_FULL);
16+
blogHelper::checkRights($move_blog_id, true, blogRightConfig::RIGHT_FULL);
1717
if ($move_blog_id != $blog_id) {
1818
blogPost::move($blog_id, $move_blog_id);
1919
} else {

‎wa-apps/blog/lib/actions/blog/blogBlogSettings.action.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ public function execute()
107107
$posts_total_count = 0;
108108
if ($blog_id) {
109109
$post_model = new blogPostModel();
110-
$posts_total_count = $post_model->countByField('blog_id',$blog_id);
110+
$posts_total_count = $post_model->countByField('blog_id', $blog_id);
111111
if ($posts_total_count) {
112112
$blog_model = new blogBlogModel();
113113
$blogs = $blog_model->getAvailable($this->getUser());
114114
$this->view->assign('blogs', $blogs);
115115
}
116116
}
117-
$this->view->assign('posts_total_count',$posts_total_count);
117+
$this->view->assign('posts_total_count', $posts_total_count);
118118

119119
$this->view->assign('blog_id', $blog_id);
120120
$this->view->assign('blog', $blog);

‎wa-apps/blog/lib/actions/blog/blogBlogSort.controller.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
*/
66
class blogBlogSortController extends waJsonController
77
{
8-
public function execute()
9-
{
10-
if ( !wa()->getUser()->isAdmin($this->getApp()) ) {
11-
$this->errors[] = _w('Access denied');
12-
return;
13-
}
14-
15-
$blog_id = (int) waRequest::get('blog_id');
16-
$sort = (int) waRequest::get('sort');
17-
$blog_model = new blogBlogModel();
18-
$blog_model->sort($blog_id, $sort);
19-
$this->response = "ok";
20-
$this->getResponse()->addHeader('Content-type', 'application/json');
21-
}
8+
public function execute()
9+
{
10+
if ( !wa()->getUser()->isAdmin($this->getApp()) ) {
11+
$this->errors[] = _w('Access denied');
12+
return;
13+
}
14+
15+
$blog_id = (int) waRequest::get('blog_id');
16+
$sort = (int) waRequest::get('sort');
17+
$blog_model = new blogBlogModel();
18+
$blog_model->sort($blog_id, $sort);
19+
$this->response = "ok";
20+
$this->getResponse()->addHeader('Content-type', 'application/json');
21+
}
2222
}

0 commit comments

Comments
 (0)