Skip to content

Commit a44efae

Browse files
author
pedro_morgan
committed
Removed debug alert()
1 parent 85db68c commit a44efae

File tree

5 files changed

+343
-56
lines changed

5 files changed

+343
-56
lines changed

‎interface/web/admin/lib/module.conf.php‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,128 @@
11
<?php
22

3-
$module["name"] = "admin";
4-
$module["title"] = "System";
5-
$module["template"] = "module.tpl.htm";
6-
$module["startpage"] = "admin/users_list.php";
7-
$module["tab_width"] = '60';
3+
global $conf;
84

5+
$module['name'] = 'admin';
6+
$module['title'] = 'System';
7+
$module['template'] = 'module.tpl.htm';
8+
$module['startpage'] = 'admin/users_list.php';
9+
$module['tab_width'] = '60';
910

10-
$items[] = array( 'title' => "Add user",
11+
12+
$items[] = array( 'title' => 'Add user',
1113
'target' => 'content',
1214
'link' => 'admin/users_edit.php');
1315

14-
$items[] = array( 'title' => "Edit user",
16+
$items[] = array( 'title' => 'Edit user',
1517
'target' => 'content',
1618
'link' => 'admin/users_list.php');
1719

1820

19-
$module["nav"][] = array( 'title' => 'CP Users',
21+
$module['nav'][] = array( 'title' => 'CP Users',
2022
'open' => 1,
2123
'items' => $items);
2224

2325

24-
// aufräumen
26+
// aufr�umen
2527
unset($items);
2628

27-
$items[] = array( 'title' => "Add group",
29+
$items[] = array( 'title' => 'Add group',
2830
'target' => 'content',
2931
'link' => 'admin/groups_edit.php');
3032

31-
$items[] = array( 'title' => "Edit group",
33+
$items[] = array( 'title' => 'Edit group',
3234
'target' => 'content',
3335
'link' => 'admin/groups_list.php');
3436

3537

36-
$module["nav"][] = array( 'title' => 'Groups',
38+
$module['nav'][] = array( 'title' => 'Groups',
3739
'open' => 1,
3840
'items' => $items);
3941

4042

41-
// aufräumen
43+
// aufr�umen
4244
unset($items);
4345
/*
44-
$items[] = array( 'title' => "Add server",
46+
$items[] = array( 'title' => 'Add server',
4547
'target' => 'content',
4648
'link' => 'admin/server_edit.php');
4749
*/
48-
$items[] = array( 'title' => "Edit server",
50+
$items[] = array( 'title' => 'Edit server',
4951
'target' => 'content',
5052
'link' => 'admin/server_list.php');
5153
/*
52-
$items[] = array( 'title' => "Add Server IP",
54+
$items[] = array( 'title' => 'Add Server IP',
5355
'target' => 'content',
5456
'link' => 'admin/server_ip_edit.php');
5557
*/
56-
$items[] = array( 'title' => "Edit Server IP",
58+
$items[] = array( 'title' => 'Edit Server IP',
5759
'target' => 'content',
5860
'link' => 'admin/server_ip_list.php');
5961

6062

61-
$module["nav"][] = array( 'title' => 'Servers',
63+
$module['nav'][] = array( 'title' => 'Servers',
6264
'open' => 1,
6365
'items' => $items);
6466

6567

66-
// aufräumen
68+
// aufr�umen
6769
unset($items);
6870

69-
$items[] = array( 'title' => "Add user",
71+
$items[] = array( 'title' => 'Add user',
7072
'target' => 'content',
7173
'link' => 'admin/dbsync_edit.php');
7274

73-
$items[] = array( 'title' => "Edit user",
75+
$items[] = array( 'title' => 'Edit user',
7476
'target' => 'content',
7577
'link' => 'admin/dbsync_list.php');
7678

7779

78-
$items[] = array( 'title' => "Sync. Now",
80+
$items[] = array( 'title' => 'Sync. Now',
7981
'target' => 'content',
8082
'link' => 'admin/dbsync_cron.php');
8183

82-
$module["nav"][] = array( 'title' => 'DB Sync.',
84+
$module['nav'][] = array( 'title' => 'DB Sync.',
8385
'open' => 1,
8486
'items' => $items);
8587

8688

87-
// aufräumen
89+
// aufr�umen
8890
unset($items);
8991

9092
/*
91-
$items[] = array( 'title' => "Add user",
93+
$items[] = array( 'title' => 'Add user',
9294
'target' => 'content',
9395
'link' => 'admin/filesync_edit.php');
9496
95-
$items[] = array( 'title' => "Edit user",
97+
$items[] = array( 'title' => 'Edit user',
9698
'target' => 'content',
9799
'link' => 'admin/filesync_list.php');
98100
99101
100-
$module["nav"][] = array( 'title' => 'File Sync.',
102+
$module['nav'][] = array( 'title' => 'File Sync.',
101103
'open' => 1,
102104
'items' => $items);
103105
104106
105-
// aufräumen
107+
// aufr�umen
106108
unset($items);
107109
*/
108110

109111

110112
// Getting the admin options from other modules
111-
$modules = explode(',',$_SESSION["s"]["user"]["modules"]);
113+
$modules = explode(',',$_SESSION['s']['user']['modules']);
112114
if(is_array($modules)) {
113115
foreach($modules as $mt) {
114-
if(is_file($mt."/lib/admin.conf.php")) {
116+
if(is_file($mt.'/lib/admin.conf.php')) {
115117
$options = array();
116-
include_once($conf["rootpath"]."/web/".$mt."/lib/admin.conf.php");
118+
include_once($conf['rootpath'].'/web/'.$mt.'/lib/admin.conf.php');
117119
if(is_array($options)) {
118120
foreach($options as $opt) {
119-
$module["nav"][] = $opt;
121+
$module['nav'][] = $opt;
120122
}
121123
}
122124
}
123125
}
124126
}
125127

126-
127-
128-
129128
?>

‎interface/web/js/scrigo.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function submitLoginForm(formname) {
6161
var userNameObj = frm.username;
6262
if(userNameObj.value == ''){
6363
userNameObj.focus();
64-
return;
64+
return;q
6565
}
6666
var passwordObj = frm.passwort;
6767
if(passwordObj.value == ''){
@@ -110,9 +110,8 @@ function submitForm(formname,target) {
110110
function loadContent(pagename) {
111111
var pageContentCallback2 = {
112112
success: function(o) {
113-
alert(o.responseText);
114-
if(o.responseText.indexOf("HEADER_REDIRECT:") > -1) {
115-
var parts = o.responseText.split(":");
113+
if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
114+
var parts = o.responseText.split(':');
116115
loadContent(parts[1]);
117116
} else {
118117
document.getElementById('pageContent').innerHTML = o.responseText;
@@ -132,7 +131,7 @@ function loadInitContent() {
132131

133132
var pageContentCallback = {
134133
success: function(o) {
135-
if(o.responseText.indexOf("HEADER_REDIRECT:") > -1) {
134+
if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
136135
var parts = o.responseText.split(":");
137136
loadContent(parts[1]);
138137
} else {

‎interface/web/login/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function render() {
6262
$user = $app->db->toLower($user);
6363
$_SESSION = array();
6464
$_SESSION['s']['user'] = $user;
65-
$_SESSION['s']['user']['theme'] = $user['app_theme'];
65+
$_SESSION['s']['user']['theme'] = isset($user['app_theme']) ? $user['app_theme'] : 'default';
6666
$_SESSION['s']['language'] = $user['language'];
6767
//print_r($_SESSION);
6868
if(is_file($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {

‎interface/web/login/templates/index.htm‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
1-
<p>&nbsp;</p>
2-
<p>&nbsp;</p>
3-
<p>&nbsp;</p>
4-
<p>&nbsp;</p>
5-
<table width="248" border="0" align="center" cellpadding="4" cellspacing="0">
1+
<div style="margin-top: 100px">
2+
<table style="width: 248px; margin: 0px auto;" class="table">
63
<tr>
7-
<td height="20" colspan="2" class="tblHead">Login</td>
4+
<th colspan="2">Login</th>
85
</tr>
96
<tmpl_if name="error">
107
<tr>
11-
<td height="46" colspan="2"><tmpl_var name="error"></td>
8+
<td colspan="2"><tmpl_var name="error"></td>
129
</tr>
1310
</tmpl_if>
1411
<tr>
15-
<td width="109" class="frmText11">Username</td>
16-
<td width="159"><input name="username" type="text" id="username" class="text"></td>
12+
<td>Username</td>
13+
<td><input name="username" type="text" id="username" class="text"></td>
1714
</tr>
1815
<tr>
19-
<td class="frmText11">Passwort</td>
16+
<td>Password</td>
2017
<td><input name="passwort" type="password" id="passwort" class="text" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm');};"></td>
2118
</tr>
2219
<tr>
2320
<td>&nbsp;</td>
24-
<td><input type="button" name="submit" id="submit" value=" Login " class="button" onclick="submitLoginForm('pageForm');" ><div class="buttonEnding"></div>
25-
</td>
26-
</tr>
27-
<tr>
28-
<td colspan="2">&nbsp;</td>
21+
<td><input type="button" name="submit" id="submit" value="&nbsp;&nbsp;Login&nbsp;&nbsp;" class="button" onclick="submitLoginForm('pageForm');" ><div class="buttonEnding"></div>
22+
</td>
2923
</tr>
3024
</table>
3125
<input type="hidden" name="s_mod" value="login" />
3226
<input type="hidden" name="s_pg" value="index" />
27+
</div>

0 commit comments

Comments
 (0)