Skip to content

Commit 510c6f5

Browse files
evolutionscriptevolutionscript
committed
Version 1.0.2
1 parent 56f5ad4 commit 510c6f5

File tree

154 files changed

+216431
-106
lines changed

Some content is hidden

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

154 files changed

+216431
-106
lines changed

‎README.md

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![](/images/logo.png)
22

3-
Version: 1.0 from 17th March 2015<br>
3+
Version: 1.0.2 from 1st June 2015<br>
44
Developed by: Evolution Script S.A.C.<br>
55
[Help Desk Software HelpDeskZ](http://www.helpdeskz.com)
66

@@ -15,6 +15,10 @@ HelpDeskZ requires:
1515
- GD Library (only for captcha verification)
1616
- Mod_rewrite (only if you want to use permalinks)-
1717

18+
## Upgrading
19+
20+
To upgrade your HelpDeskZ from previus versions, please read the file UPGRADING.txt
21+
1822
## Installation steps
1923

2024
- Connect with FTP to the <em>public folder</em> of your server where the rest of your Web site is
@@ -43,10 +47,3 @@ For detailed information please see this <a href="http://www.helpdeskz.com/help/
4347

4448
## Translate HelpDeskZ to your language
4549
To translate HelpDeskZ read <a href="http://www.helpdeskz.com/help/knowledgebase/2/article/8/how-can-i-translate-helpdeskz">How can I translate HelpDeskZ.</a>
46-
47-
## Rate us
48-
Rate our script on:
49-
- http://www.hotscripts.com/listing/helpdeskz/
50-
- http://www.opensourcescripts.com/info/helpdeskz.html
51-
52-
Note: HelpDeskZ can now be installed easily with just one click via <a href="http://www.softaculous.com/apps/customersupport/HelpDeskZ">Softaculous.</a>

‎UPGRADING.txt

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
Welcome to HelpDeskZ 1.0.2
2+
==========================
3+
4+
We have made some changes in this new version like:
5+
6+
- SEO-friendly URLs compatibility fixed
7+
8+
- Login with Facebook account (Facebook connect)
9+
10+
- Login with Google account (Google OAuth)
11+
12+
- Email notification to staff assigned when new ticket is created
13+
14+
- Social buttons to share knowledgebase articles or news
15+
16+
17+
To upgrade from 1.0 to 1.0.2
18+
============================
19+
20+
- Upload the next files:
21+
/controllers/admin/general_action.php
22+
/controllers/login_controller.php
23+
/controllers/staff/preferences_action.php
24+
/controllers/submit_ticket_controller.php
25+
/css/style.css
26+
/facebookOAuth/*.*
27+
/googleOAuth/*.*
28+
/images/google.png
29+
/images/facebook.png
30+
/includes/bootstrap.php
31+
/includes/functions.php
32+
/install/*.*
33+
/js/staff.js
34+
/views/client/knowledgebase_article.html
35+
/views/client/news_article.html
36+
/views/client/site.html
37+
/views/staff/admin_general.html
38+
/views/staff/preferences.html
39+
40+
- Visit the url http://yourHelpDeskz.com/install click on upgrade button and follow the indications.

‎controllers/admin/general_action.php

+15
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,21 @@
104104
header('location: '.getUrl($controller,$action, array('general','security_updated#ctab6')));
105105
exit;
106106
}
107+
}elseif($params[1] == 'update_social'){
108+
if(verifyToken('general_settings', $input->p['csrfhash']) !== true){
109+
$error_msg = $LANG['CSRF_ERROR'];
110+
}else{
111+
$db->update(TABLE_PREFIX."settings", array('value' => ($input->p['facebookoauth'] == 1?1:0)), "field='facebookoauth'");
112+
$db->update(TABLE_PREFIX."settings", array('value' => $input->p['facebookappid']), "field='facebookappid'");
113+
$db->update(TABLE_PREFIX."settings", array('value' => $input->p['facebookappsecret']), "field='facebookappsecret'");
114+
$db->update(TABLE_PREFIX."settings", array('value' => ($input->p['googleoauth'] == 1?1:0)), "field='googleoauth'");
115+
$db->update(TABLE_PREFIX."settings", array('value' => $input->p['googleclientid']), "field='googleclientid'");
116+
$db->update(TABLE_PREFIX."settings", array('value' => $input->p['googleclientsecret']), "field='googleclientsecret'");
117+
$db->update(TABLE_PREFIX."settings", array('value' => $input->p['socialbuttonnews']), "field='socialbuttonnews'");
118+
$db->update(TABLE_PREFIX."settings", array('value' => $input->p['socialbuttonkb']), "field='socialbuttonkb'");
119+
header('location: '.getUrl($controller,$action, array('general','security_social#ctab7')));
120+
exit;
121+
}
107122
}
108123
$homepage = $db->fetchRow("SELECT * FROM ".TABLE_PREFIX."pages WHERE id='home'");
109124
$page_title = 'Settings > General';

‎controllers/login_controller.php

+5-10
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
$xml = simplexml_load_string($output);
2929
if($xml !== false){
3030
if($xml->result == 1 && !empty($xml->user->fullname) && !empty($xml->user->email)){
31+
hdz_registerAccount(array('fullname' => $xml->user->fullname,
32+
'email' => $xml->user->email,
33+
'password' => $input->p['password']), FALSE, TRUE);
34+
3135
$data = array('fullname' => $xml->user->fullname, 'email' => $xml->user->email, 'password' => sha1($input->p['password']));
3236
$chk = $db->fetchOne("SELECT COUNT(id) AS NUM FROM ".TABLE_PREFIX."users WHERE email='".$db->real_escape_string($input->p['email'])."'");
3337

@@ -50,16 +54,7 @@
5054
}else{
5155
$cookie_time = 1;
5256
}
53-
$user = $db->fetchRow("SELECT * FROM ".TABLE_PREFIX."users WHERE email='".$db->real_escape_string($input->p['email'])."'");
54-
$cookie_time = time() + (60*60*$cookie_time);
55-
$data = array('id' => $user['id'], 'email' => $user['email'], 'password' => $user['password'], 'expires' => $cookie_time);
56-
$data = serialize($data);
57-
$data = encrypt($data);
58-
59-
setcookie('usrhash', $data, $cookie_time, '/');
60-
$_SESSION['user']['id'] = $user['id'];
61-
$_SESSION['user']['email'] = $user['email'];
62-
$_SESSION['user']['password'] = $user['password'];
57+
hdz_loginAccount($input->p['email'], $cookie_time);
6358
header('location: '.getUrl('view_tickets'));
6459
exit;
6560
}

‎controllers/staff/preferences_action.php

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
'email' => $input->p['email'],
4444
'signature' => $input->p['signature'],
4545
'timezone' => (in_array($input->p['timezone'], $timezone)?$input->p['timezone']:''),
46+
'newticket_notification' => ($input->p['newticket_notification'] == 1?1:0),
4647
);
4748
$db->update(TABLE_PREFIX."staff", $data, "id={$staff['id']}");
4849
header('location: '.getUrl($controller,$action, 'profile_updated'));

‎controllers/submit_ticket_controller.php

+31-25
Original file line numberDiff line numberDiff line change
@@ -170,29 +170,10 @@
170170
$email = $user['email'];
171171
$user_id = $user['id'];
172172
}else{
173-
$fullname = $input->p['fullname'];
174-
$email = $input->p['email'];
175-
$chk = $db->fetchRow("SELECT COUNT(id) AS total, id FROM ".TABLE_PREFIX."users WHERE email='".$db->real_escape_string($email)."'");
176-
if($chk['total'] == 0){
177-
$password = substr((md5(time().$fullname)),5,7);
178-
$data = array('fullname' => $fullname,
179-
'email' => $email,
180-
'password' => sha1($password),
181-
);
182-
$db->insert(TABLE_PREFIX."users", $data);
183-
$user_id = $db->lastInsertId();
184-
/* Mailer */
185-
$data_mail = array(
186-
'id' => 'new_user',
187-
'to' => $fullname,
188-
'to_mail' => $email,
189-
'vars' => array('%client_name%' => $fullname, '%client_email%' => $email, '%client_password%' => $password),
190-
);
191-
$mailer = new Mailer($data_mail);
192-
}else{
193-
$user_id = $chk['id'];
194-
}
195-
173+
$fullname = $input->p['fullname'];
174+
$email = $input->p['email'];
175+
$user_id = hdz_registerAccount(array('fullname' => $input->p['fullname'],
176+
'email' =>$input->p['email']));
196177
}
197178
$ticket_id = substr(strtoupper(sha1(time().$email)), 0, 11);
198179
$ticket_id = substr_replace($ticket_id, '-',3,0);
@@ -245,6 +226,32 @@
245226
),
246227
);
247228
$mailer = new Mailer($data_mail);
229+
230+
/* New ticket notification for staff */
231+
$q = $db->query("SELECT id, fullname, email, department FROM ".TABLE_PREFIX."staff WHERE newticket_notification=1 AND status='Enable'");
232+
while($r = $db->fetch_array($q))
233+
{
234+
$department_list = unserialize($r['department']);
235+
$department_list = (is_array($department_list)?$department_list:array());
236+
if(in_array($department_id,$department_list))
237+
{
238+
/* Mailer */
239+
$data_mail = array(
240+
'id' => 'staff_ticketnotification',
241+
'to' => $r['fullname'],
242+
'to_mail' => $r['email'],
243+
'vars' => array('%staff_name%' => $r['fullname'],
244+
'%ticket_id%' => $ticket_id,
245+
'%ticket_subject%' => $input->p['subject'],
246+
'%ticket_department%' => $department['name'],
247+
'%ticket_status%' => $LANG['OPEN'],
248+
'%ticket_priority%' => $priorityvar['name'],
249+
),
250+
);
251+
$mailer = new Mailer($data_mail);
252+
}
253+
}
254+
248255
unset($_SESSION['captcha']);
249256
header('location: '.getUrl('submit_ticket','confirmationMsg',array($ticket_id,$previewcode)));
250257
exit;
@@ -301,10 +308,9 @@
301308
}
302309
}
303310

304-
305311
$q = $db->query("SELECT * FROM ".TABLE_PREFIX."departments WHERE type=0 ORDER BY dep_order ASC");
306312
while($r = $db->fetch_array($q)){
307-
$departments[] = $r;
313+
$departments[] = $r;
308314
}
309315
$template_vars['departments'] = $departments;
310316
$template_vars['display_error'] = $display_error;

‎css/style.css

+48-1
Original file line numberDiff line numberDiff line change
@@ -529,4 +529,51 @@ text-align:center;
529529
text-align:center;
530530
font-size:24px;
531531
padding:5px 0px;
532-
}
532+
}
533+
534+
/* V1.0.2 */
535+
.social_button{
536+
background: #ffffff; /* Old browsers */
537+
background: -moz-linear-gradient(top, #ffffff 0%, #e6e6e6 100%); /* FF3.6+ */
538+
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#e6e6e6)); /* Chrome,Safari4+ */
539+
background: -webkit-linear-gradient(top, #ffffff 0%,#e6e6e6 100%); /* Chrome10+,Safari5.1+ */
540+
background: -o-linear-gradient(top, #ffffff 0%,#e6e6e6 100%); /* Opera 11.10+ */
541+
background: -ms-linear-gradient(top, #ffffff 0%,#e6e6e6 100%); /* IE10+ */
542+
background: linear-gradient(to bottom, #ffffff 0%,#e6e6e6 100%); /* W3C */
543+
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e6e6e6',GradientType=0 ); /* IE6-9 */
544+
border:1px solid #d9d9d9;
545+
border-radius: 4px;
546+
padding: 2px 5px;
547+
width: 110px;
548+
display: block;
549+
color: #333333;
550+
text-align: left;
551+
margin-top: 10px;
552+
}
553+
.social_button:hover{
554+
background: #f4f4f4; /* Old browsers */
555+
background: -moz-linear-gradient(top, #f4f4f4 0%, #e6e6e6 100%); /* FF3.6+ */
556+
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f4f4), color-stop(100%,#e6e6e6)); /* Chrome,Safari4+ */
557+
background: -webkit-linear-gradient(top, #f4f4f4 0%,#e6e6e6 100%); /* Chrome10+,Safari5.1+ */
558+
background: -o-linear-gradient(top, #f4f4f4 0%,#e6e6e6 100%); /* Opera 11.10+ */
559+
background: -ms-linear-gradient(top, #f4f4f4 0%,#e6e6e6 100%); /* IE10+ */
560+
background: linear-gradient(to bottom, #f4f4f4 0%,#e6e6e6 100%); /* W3C */
561+
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#e6e6e6',GradientType=0 ); /* IE6-9 */
562+
color: #333333;
563+
}
564+
.social_button .google{
565+
background: url('../images/google.png');
566+
width:20px;
567+
height:20px;
568+
display: inline-block;
569+
vertical-align: text-top;
570+
margin-right: 10px;
571+
}
572+
.social_button .facebook{
573+
background: url('../images/facebook.png');
574+
width:20px;
575+
height:20px;
576+
display: inline-block;
577+
vertical-align: text-top;
578+
margin-right: 10px;
579+
}

0 commit comments

Comments
 (0)