Skip to content

Commit 079928f

Browse files
ggoffyggoffy
authored
Merge pull request #62 from ggoffy/master
replaced XoopsConfirm
2 parents a34db4e + 5a286bd commit 079928f

62 files changed

Lines changed: 132 additions & 23698 deletions

Some content is hidden

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

‎admin/directories.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@
168168
$GLOBALS['xoopsTpl']->assign('errors', $errors);
169169
}
170170
} else {
171-
$xoopsconfirm = new Common\XoopsConfirm(
171+
$customConfirm = new Common\Confirm(
172172
['ok' => 1, 'dir_id' => $dirId, 'op' => 'delete'],
173173
$_SERVER['REQUEST_URI'],
174174
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $dirName));
175-
$form = $xoopsconfirm->getFormXoopsConfirm();
175+
$form = $customConfirm->getFormConfirm();
176176
$GLOBALS['xoopsTpl']->assign('form', $form->render());
177177
}
178178
break;

‎admin/logs.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@
115115
$GLOBALS['xoopsTpl']->assign('error', $logsObj->getHtmlErrors());
116116
}
117117
} else {
118-
$xoopsconfirm = new Common\XoopsConfirm(
118+
$customConfirm = new Common\Confirm(
119119
['ok' => 1, 'log_id' => $logId, 'op' => 'delete'],
120120
$_SERVER['REQUEST_URI'],
121-
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $logsObj->getVar('log_details')));
122-
$form = $xoopsconfirm->getFormXoopsConfirm();
121+
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $logsObj->getVar('log_id') . ': ' . $logsObj->getVar('log_details')));
122+
$form = $customConfirm->getFormConfirm();
123123
$GLOBALS['xoopsTpl']->assign('form', $form->render());
124124
}
125125
break;
@@ -135,11 +135,11 @@
135135
$logsHandler->deleteAll(null, true);
136136
\redirect_header('logs.php', 3, \_AM_WGGITHUB_FORM_DELETE_OK);
137137
} else {
138-
$xoopsconfirm = new Common\XoopsConfirm(
138+
$customConfirm = new Common\Confirm(
139139
['ok' => 1, 'op' => 'clear'],
140140
$_SERVER['REQUEST_URI'],
141141
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETEALL, 'wggithub_logs'));
142-
$form = $xoopsconfirm->getFormXoopsConfirm();
142+
$form = $customConfirm->getFormConfirm();
143143
$GLOBALS['xoopsTpl']->assign('form', $form->render());
144144
}
145145
break;

‎admin/readmes.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@
139139
$templateMain = 'wggithub_admin_readmes.tpl';
140140
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('readmes.php'));
141141
$readmesObj = $readmesHandler->get($rmId);
142-
$rmName = $readmesObj->getVar('rm_name');
143142
if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
144143
if (!$GLOBALS['xoopsSecurity']->check()) {
145144
\redirect_header('readmes.php', 3, \implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -150,11 +149,12 @@
150149
$GLOBALS['xoopsTpl']->assign('error', $readmesObj->getHtmlErrors());
151150
}
152151
} else {
153-
$xoopsconfirm = new Common\XoopsConfirm(
152+
$repositoriesObj = $repositoriesHandler->get($readmesObj->getVar('rm_repoid'));
153+
$customConfirm = new Common\Confirm(
154154
['ok' => 1, 'rm_id' => $rmId, 'op' => 'delete'],
155155
$_SERVER['REQUEST_URI'],
156-
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $readmesObj->getVar('rm_name')));
157-
$form = $xoopsconfirm->getFormXoopsConfirm();
156+
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $repositoriesObj->getVar('repo_name') . ' - ' . $readmesObj->getVar('rm_name')));
157+
$form = $customConfirm->getFormConfirm();
158158
$GLOBALS['xoopsTpl']->assign('form', $form->render());
159159
}
160160
break;

‎admin/releases.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
$templateMain = 'wggithub_admin_releases.tpl';
129129
$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('releases.php'));
130130
$releasesObj = $releasesHandler->get($relId);
131-
$relName = $releasesObj->getVar('rel_name');
132131
if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
133132
if (!$GLOBALS['xoopsSecurity']->check()) {
134133
\redirect_header('releases.php', 3, \implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
@@ -139,11 +138,12 @@
139138
$GLOBALS['xoopsTpl']->assign('error', $releasesObj->getHtmlErrors());
140139
}
141140
} else {
142-
$xoopsconfirm = new Common\XoopsConfirm(
141+
$repositoriesObj = $repositoriesHandler->get($releasesObj->getVar('rel_repoid'));
142+
$customConfirm = new Common\Confirm(
143143
['ok' => 1, 'rel_id' => $relId, 'op' => 'delete'],
144144
$_SERVER['REQUEST_URI'],
145-
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $releasesObj->getVar('rel_name')));
146-
$form = $xoopsconfirm->getFormXoopsConfirm();
145+
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $repositoriesObj->getVar('repo_name') . ' - ' . $releasesObj->getVar('rel_name')));
146+
$form = $customConfirm->getFormConfirm();
147147
$GLOBALS['xoopsTpl']->assign('form', $form->render());
148148
}
149149
break;

‎admin/repositories.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@
156156
$GLOBALS['xoopsTpl']->assign('error', $repositoriesObj->getHtmlErrors());
157157
}
158158
} else {
159-
$xoopsconfirm = new Common\XoopsConfirm(
159+
$customConfirm = new Common\Confirm(
160160
['ok' => 1, 'repo_id' => $repoId, 'op' => 'delete'],
161161
$_SERVER['REQUEST_URI'],
162-
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $repositoriesObj->getVar('repo_name')));
163-
$form = $xoopsconfirm->getFormXoopsConfirm();
162+
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $repositoriesObj->getVar('repo_fullname')));
163+
$form = $customConfirm->getFormConfirm();
164164
$GLOBALS['xoopsTpl']->assign('form', $form->render());
165165
}
166166
break;

‎admin/requests.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@
124124
$GLOBALS['xoopsTpl']->assign('error', $requestsObj->getHtmlErrors());
125125
}
126126
} else {
127-
$xoopsconfirm = new Common\XoopsConfirm(
127+
$customConfirm = new Common\Confirm(
128128
['ok' => 1, 'req_id' => $reqId, 'op' => 'delete'],
129129
$_SERVER['REQUEST_URI'],
130130
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $requestsObj->getVar('req_request')));
131-
$form = $xoopsconfirm->getFormXoopsConfirm();
131+
$form = $customConfirm->getFormConfirm();
132132
$GLOBALS['xoopsTpl']->assign('form', $form->render());
133133
}
134134
break;

‎admin/settings.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@
139139
$GLOBALS['xoopsTpl']->assign('error', $settingsObj->getHtmlErrors());
140140
}
141141
} else {
142-
$xoopsconfirm = new Common\XoopsConfirm(
142+
$customConfirm = new Common\Confirm(
143143
['ok' => 1, 'set_id' => $setId, 'op' => 'delete'],
144144
$_SERVER['REQUEST_URI'],
145145
\sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $settingsObj->getVar('set_token')));
146-
$form = $xoopsconfirm->getFormXoopsConfirm();
146+
$form = $customConfirm->getFormConfirm();
147147
$GLOBALS['xoopsTpl']->assign('form', $form->render());
148148
}
149149
break;

‎assets/css/admin/index.html‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎assets/css/index.html‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎assets/icons/16/index.html‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)