@@ -35,60 +35,60 @@ |
||
35 | 35 | */ |
36 | 36 | function wggithub_search($queryarray, $andor, $limit, $offset, $userid) |
37 | 37 | { |
38 | - $ret = []; |
|
39 | - $helper = \XoopsModules\Wggithub\Helper::getInstance(); |
|
38 | + $ret = []; |
|
39 | + $helper = \XoopsModules\Wggithub\Helper::getInstance(); |
|
40 | 40 | |
41 | - // search in table repositories |
|
42 | - // search keywords |
|
43 | - $elementCount = 0; |
|
44 | - $repositoriesHandler = $helper->getHandler('Repositories'); |
|
45 | - if (\is_array($queryarray)) { |
|
46 | - $elementCount = \count($queryarray); |
|
47 | - } |
|
48 | - if ($elementCount > 0) { |
|
49 | - $crKeywords = new \CriteriaCompo(); |
|
50 | - for ($i = 0; $i < $elementCount; $i++) { |
|
51 | - $crKeyword = new \CriteriaCompo(); |
|
52 | - unset($crKeyword); |
|
53 | - } |
|
54 | - } |
|
55 | - // search user(s) |
|
56 | - if ($userid && \is_array($userid)) { |
|
57 | - $userid = array_map('intval', $userid); |
|
58 | - $crUser = new \CriteriaCompo(); |
|
59 | - $crUser->add(new \Criteria('repo_submitter', '(' . \implode(',', $userid) . ')', 'IN'), 'OR'); |
|
60 | - } elseif (is_numeric($userid) && $userid > 0) { |
|
61 | - $crUser = new \CriteriaCompo(); |
|
62 | - $crUser->add(new \Criteria('repo_submitter', $userid), 'OR'); |
|
63 | - } |
|
64 | - $crSearch = new \CriteriaCompo(); |
|
65 | - if (isset($crKeywords)) { |
|
66 | - $crSearch->add($crKeywords, 'AND'); |
|
67 | - } |
|
68 | - if (isset($crUser)) { |
|
69 | - $crSearch->add($crUser, 'AND'); |
|
70 | - } |
|
71 | - $crSearch->setStart($offset); |
|
72 | - $crSearch->setLimit($limit); |
|
73 | - $crSearch->setSort('repo_datecreated'); |
|
74 | - $crSearch->setOrder('DESC'); |
|
75 | - $repositoriesAll = $repositoriesHandler->getAll($crSearch); |
|
76 | - foreach (\array_keys($repositoriesAll) as $i) { |
|
77 | - $ret[] = [ |
|
78 | - 'image' => 'assets/icons/16/repositories.png', |
|
79 | - 'link' => 'repositories.php?op=show&repo_id=' . $repositoriesAll[$i]->getVar('repo_id'), |
|
80 | - 'title' => $repositoriesAll[$i]->getVar('repo_name'), |
|
81 | - 'time' => $repositoriesAll[$i]->getVar('repo_datecreated') |
|
82 | - ]; |
|
83 | - } |
|
84 | - unset($crKeywords); |
|
85 | - unset($crKeyword); |
|
86 | - unset($crUser); |
|
87 | - unset($crSearch); |
|
41 | + // search in table repositories |
|
42 | + // search keywords |
|
43 | + $elementCount = 0; |
|
44 | + $repositoriesHandler = $helper->getHandler('Repositories'); |
|
45 | + if (\is_array($queryarray)) { |
|
46 | + $elementCount = \count($queryarray); |
|
47 | + } |
|
48 | + if ($elementCount > 0) { |
|
49 | + $crKeywords = new \CriteriaCompo(); |
|
50 | + for ($i = 0; $i < $elementCount; $i++) { |
|
51 | + $crKeyword = new \CriteriaCompo(); |
|
52 | + unset($crKeyword); |
|
53 | + } |
|
54 | + } |
|
55 | + // search user(s) |
|
56 | + if ($userid && \is_array($userid)) { |
|
57 | + $userid = array_map('intval', $userid); |
|
58 | + $crUser = new \CriteriaCompo(); |
|
59 | + $crUser->add(new \Criteria('repo_submitter', '(' . \implode(',', $userid) . ')', 'IN'), 'OR'); |
|
60 | + } elseif (is_numeric($userid) && $userid > 0) { |
|
61 | + $crUser = new \CriteriaCompo(); |
|
62 | + $crUser->add(new \Criteria('repo_submitter', $userid), 'OR'); |
|
63 | + } |
|
64 | + $crSearch = new \CriteriaCompo(); |
|
65 | + if (isset($crKeywords)) { |
|
66 | + $crSearch->add($crKeywords, 'AND'); |
|
67 | + } |
|
68 | + if (isset($crUser)) { |
|
69 | + $crSearch->add($crUser, 'AND'); |
|
70 | + } |
|
71 | + $crSearch->setStart($offset); |
|
72 | + $crSearch->setLimit($limit); |
|
73 | + $crSearch->setSort('repo_datecreated'); |
|
74 | + $crSearch->setOrder('DESC'); |
|
75 | + $repositoriesAll = $repositoriesHandler->getAll($crSearch); |
|
76 | + foreach (\array_keys($repositoriesAll) as $i) { |
|
77 | + $ret[] = [ |
|
78 | + 'image' => 'assets/icons/16/repositories.png', |
|
79 | + 'link' => 'repositories.php?op=show&repo_id=' . $repositoriesAll[$i]->getVar('repo_id'), |
|
80 | + 'title' => $repositoriesAll[$i]->getVar('repo_name'), |
|
81 | + 'time' => $repositoriesAll[$i]->getVar('repo_datecreated') |
|
82 | + ]; |
|
83 | + } |
|
84 | + unset($crKeywords); |
|
85 | + unset($crKeyword); |
|
86 | + unset($crUser); |
|
87 | + unset($crSearch); |
|
88 | 88 | |
89 | 89 | |
90 | 90 | |
91 | 91 | |
92 | - return $ret; |
|
92 | + return $ret; |
|
93 | 93 | |
94 | 94 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | } |
48 | 48 | if ($elementCount > 0) { |
49 | 49 | $crKeywords = new \CriteriaCompo(); |
50 | - for ($i = 0; $i < $elementCount; $i++) { |
|
50 | + for ($i = 0; $i < $elementCount; $i++) { |
|
51 | 51 | $crKeyword = new \CriteriaCompo(); |
52 | 52 | unset($crKeyword); |
53 | 53 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | if ($userid && \is_array($userid)) { |
57 | 57 | $userid = array_map('intval', $userid); |
58 | 58 | $crUser = new \CriteriaCompo(); |
59 | - $crUser->add(new \Criteria('repo_submitter', '(' . \implode(',', $userid) . ')', 'IN'), 'OR'); |
|
59 | + $crUser->add(new \Criteria('repo_submitter', '('.\implode(',', $userid).')', 'IN'), 'OR'); |
|
60 | 60 | } elseif (is_numeric($userid) && $userid > 0) { |
61 | 61 | $crUser = new \CriteriaCompo(); |
62 | 62 | $crUser->add(new \Criteria('repo_submitter', $userid), 'OR'); |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | foreach (\array_keys($repositoriesAll) as $i) { |
77 | 77 | $ret[] = [ |
78 | 78 | 'image' => 'assets/icons/16/repositories.png', |
79 | - 'link' => 'repositories.php?op=show&repo_id=' . $repositoriesAll[$i]->getVar('repo_id'), |
|
79 | + 'link' => 'repositories.php?op=show&repo_id='.$repositoriesAll[$i]->getVar('repo_id'), |
|
80 | 80 | 'title' => $repositoriesAll[$i]->getVar('repo_name'), |
81 | 81 | 'time' => $repositoriesAll[$i]->getVar('repo_datecreated') |
82 | 82 | ]; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $ret = wggithub_check_db($module); |
40 | 40 | |
41 | 41 | //check upload directory |
42 | - include_once __DIR__ . '/install.php'; |
|
42 | + include_once __DIR__ . '/install.php'; |
|
43 | 43 | $ret = xoops_module_install_wggithub($module); |
44 | 44 | |
45 | 45 | $errors = $module->getErrors(); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | function wggithub_check_db($module) |
114 | 114 | { |
115 | 115 | $ret = true; |
116 | - //insert here code for database check |
|
116 | + //insert here code for database check |
|
117 | 117 | |
118 | 118 | // Example: update table (add new field) |
119 | 119 | $table = $GLOBALS['xoopsDB']->prefix('wggithub_repositories'); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $ret = wggithub_check_db($module); |
40 | 40 | |
41 | 41 | //check upload directory |
42 | - include_once __DIR__ . '/install.php'; |
|
42 | + include_once __DIR__.'/install.php'; |
|
43 | 43 | $ret = xoops_module_install_wggithub($module); |
44 | 44 | |
45 | 45 | $errors = $module->getErrors(); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | { |
62 | 62 | global $xoopsDB; |
63 | 63 | $result = $xoopsDB->query( |
64 | - 'SELECT t1.tpl_id FROM ' . $xoopsDB->prefix('tplfile') . ' t1, ' . $xoopsDB->prefix('tplfile') . ' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id' |
|
64 | + 'SELECT t1.tpl_id FROM '.$xoopsDB->prefix('tplfile').' t1, '.$xoopsDB->prefix('tplfile').' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id' |
|
65 | 65 | ); |
66 | 66 | $tplids = []; |
67 | 67 | while (false !== (list($tplid) = $xoopsDB->fetchRow($result))) { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | if (\count($tplids) > 0) { |
71 | 71 | $tplfileHandler = \xoops_getHandler('tplfile'); |
72 | - $duplicate_files = $tplfileHandler->getObjects(new \Criteria('tpl_id', '(' . \implode(',', $tplids) . ')', 'IN')); |
|
72 | + $duplicate_files = $tplfileHandler->getObjects(new \Criteria('tpl_id', '('.\implode(',', $tplids).')', 'IN')); |
|
73 | 73 | |
74 | 74 | if (\count($duplicate_files) > 0) { |
75 | 75 | foreach (\array_keys($duplicate_files) as $i) { |
@@ -77,9 +77,9 @@ discard block |
||
77 | 77 | } |
78 | 78 | } |
79 | 79 | } |
80 | - $sql = 'SHOW INDEX FROM ' . $xoopsDB->prefix('tplfile') . " WHERE KEY_NAME = 'tpl_refid_module_set_file_type'"; |
|
80 | + $sql = 'SHOW INDEX FROM '.$xoopsDB->prefix('tplfile')." WHERE KEY_NAME = 'tpl_refid_module_set_file_type'"; |
|
81 | 81 | if (!$result = $xoopsDB->queryF($sql)) { |
82 | - xoops_error($xoopsDB->error() . '<br>' . $sql); |
|
82 | + xoops_error($xoopsDB->error().'<br>'.$sql); |
|
83 | 83 | |
84 | 84 | return false; |
85 | 85 | } |
@@ -92,9 +92,9 @@ discard block |
||
92 | 92 | |
93 | 93 | return true; |
94 | 94 | } |
95 | - $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile') . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )'; |
|
95 | + $sql = 'ALTER TABLE '.$xoopsDB->prefix('tplfile').' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )'; |
|
96 | 96 | if (!$result = $xoopsDB->queryF($sql)) { |
97 | - xoops_error($xoopsDB->error() . '<br>' . $sql); |
|
97 | + xoops_error($xoopsDB->error().'<br>'.$sql); |
|
98 | 98 | $module->setErrors("'tpl_refid_module_set_file_type' unique index is not added to 'tplfile' table. Warning: do not use XOOPS until you add this unique index."); |
99 | 99 | |
100 | 100 | return false; |
@@ -118,12 +118,12 @@ discard block |
||
118 | 118 | // Example: update table (add new field) |
119 | 119 | $table = $GLOBALS['xoopsDB']->prefix('wggithub_repositories'); |
120 | 120 | $field = 'repo_release'; |
121 | - $check = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'"); |
|
121 | + $check = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'"); |
|
122 | 122 | $numRows = $GLOBALS['xoopsDB']->getRowsNum($check); |
123 | 123 | if (!$numRows) { |
124 | 124 | $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;"; |
125 | 125 | if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) { |
126 | - xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql); |
|
126 | + xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql); |
|
127 | 127 | $module->setErrors("Error when adding '$field' to table '$table'."); |
128 | 128 | $ret = false; |
129 | 129 | } |
@@ -132,12 +132,12 @@ discard block |
||
132 | 132 | // Example: update table (add new field) |
133 | 133 | $table = $GLOBALS['xoopsDB']->prefix('wggithub_repositories'); |
134 | 134 | $field = 'repo_prerelease'; |
135 | - $check = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'"); |
|
135 | + $check = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'"); |
|
136 | 136 | $numRows = $GLOBALS['xoopsDB']->getRowsNum($check); |
137 | 137 | if (!$numRows) { |
138 | 138 | $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;"; |
139 | 139 | if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) { |
140 | - xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql); |
|
140 | + xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql); |
|
141 | 141 | $module->setErrors("Error when adding '$field' to table '$table'."); |
142 | 142 | $ret = false; |
143 | 143 | } |
@@ -146,12 +146,12 @@ discard block |
||
146 | 146 | // Example: update table (add new field) |
147 | 147 | $table = $GLOBALS['xoopsDB']->prefix('wggithub_directories'); |
148 | 148 | $field = 'dir_filterrelease'; |
149 | - $check = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'"); |
|
149 | + $check = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'"); |
|
150 | 150 | $numRows = $GLOBALS['xoopsDB']->getRowsNum($check); |
151 | 151 | if (!$numRows) { |
152 | 152 | $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `dir_online`;"; |
153 | 153 | if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) { |
154 | - xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql); |
|
154 | + xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql); |
|
155 | 155 | $module->setErrors("Error when adding '$field' to table '$table'."); |
156 | 156 | $ret = false; |
157 | 157 | } |
@@ -29,26 +29,26 @@ |
||
29 | 29 | */ |
30 | 30 | function wggithub_notify_iteminfo($category, $item_id) |
31 | 31 | { |
32 | - global $xoopsDB; |
|
32 | + global $xoopsDB; |
|
33 | 33 | |
34 | - if (!\defined('WGGITHUB_URL')) { |
|
35 | - \define('WGGITHUB_URL', \XOOPS_URL . '/modules/wggithub'); |
|
36 | - } |
|
34 | + if (!\defined('WGGITHUB_URL')) { |
|
35 | + \define('WGGITHUB_URL', \XOOPS_URL . '/modules/wggithub'); |
|
36 | + } |
|
37 | 37 | |
38 | - switch ($category) { |
|
39 | - case 'global': |
|
40 | - $item['name'] = ''; |
|
41 | - $item['url'] = ''; |
|
42 | - return $item; |
|
43 | - break; |
|
44 | - case 'repositories': |
|
45 | - $sql = 'SELECT repo_name FROM ' . $xoopsDB->prefix('wggithub_repositories') . ' WHERE repo_id = '. $item_id; |
|
46 | - $result = $xoopsDB->query($sql); |
|
47 | - $result_array = $xoopsDB->fetchArray($result); |
|
48 | - $item['name'] = $result_array['repo_name']; |
|
49 | - $item['url'] = WGGITHUB_URL . '/repositories.php?repo_id=' . $item_id; |
|
50 | - return $item; |
|
51 | - break; |
|
52 | - } |
|
53 | - return null; |
|
38 | + switch ($category) { |
|
39 | + case 'global': |
|
40 | + $item['name'] = ''; |
|
41 | + $item['url'] = ''; |
|
42 | + return $item; |
|
43 | + break; |
|
44 | + case 'repositories': |
|
45 | + $sql = 'SELECT repo_name FROM ' . $xoopsDB->prefix('wggithub_repositories') . ' WHERE repo_id = '. $item_id; |
|
46 | + $result = $xoopsDB->query($sql); |
|
47 | + $result_array = $xoopsDB->fetchArray($result); |
|
48 | + $item['name'] = $result_array['repo_name']; |
|
49 | + $item['url'] = WGGITHUB_URL . '/repositories.php?repo_id=' . $item_id; |
|
50 | + return $item; |
|
51 | + break; |
|
52 | + } |
|
53 | + return null; |
|
54 | 54 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | global $xoopsDB; |
33 | 33 | |
34 | 34 | if (!\defined('WGGITHUB_URL')) { |
35 | - \define('WGGITHUB_URL', \XOOPS_URL . '/modules/wggithub'); |
|
35 | + \define('WGGITHUB_URL', \XOOPS_URL.'/modules/wggithub'); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | switch ($category) { |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | return $item; |
43 | 43 | break; |
44 | 44 | case 'repositories': |
45 | - $sql = 'SELECT repo_name FROM ' . $xoopsDB->prefix('wggithub_repositories') . ' WHERE repo_id = '. $item_id; |
|
45 | + $sql = 'SELECT repo_name FROM '.$xoopsDB->prefix('wggithub_repositories').' WHERE repo_id = '.$item_id; |
|
46 | 46 | $result = $xoopsDB->query($sql); |
47 | 47 | $result_array = $xoopsDB->fetchArray($result); |
48 | 48 | $item['name'] = $result_array['repo_name']; |
49 | - $item['url'] = WGGITHUB_URL . '/repositories.php?repo_id=' . $item_id; |
|
49 | + $item['url'] = WGGITHUB_URL.'/repositories.php?repo_id='.$item_id; |
|
50 | 50 | return $item; |
51 | 51 | break; |
52 | 52 | } |
@@ -84,7 +84,7 @@ |
||
84 | 84 | $dest = $configurator->copyBlankFiles[$i] . '/blank.gif'; |
85 | 85 | $utility::copyFile($file, $dest); |
86 | 86 | } |
87 | - $file = \dirname(__DIR__) . '/assets/images/blank.png'; |
|
87 | + $file = \dirname(__DIR__) . '/assets/images/blank.png'; |
|
88 | 88 | foreach (\array_keys($configurator->copyBlankFiles) as $i) { |
89 | 89 | $dest = $configurator->copyBlankFiles[$i] . '/blank.png'; |
90 | 90 | $utility::copyFile($file, $dest); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | function xoops_module_pre_install_wggithub(\XoopsModule $module) |
31 | 31 | { |
32 | - require \dirname(__DIR__) . '/preloads/autoloader.php'; |
|
32 | + require \dirname(__DIR__).'/preloads/autoloader.php'; |
|
33 | 33 | |
34 | 34 | $utility = new Wggithub\Utility(); |
35 | 35 | |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | if ($xoopsSuccess && $phpSuccess) { |
43 | 43 | $moduleTables = &$module->getInfo('tables'); |
44 | 44 | foreach ($moduleTables as $table) { |
45 | - $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';'); |
|
45 | + $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';'); |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | */ |
56 | 56 | function xoops_module_install_wggithub(\XoopsModule $module) |
57 | 57 | { |
58 | - require \dirname(__DIR__) . '/preloads/autoloader.php'; |
|
58 | + require \dirname(__DIR__).'/preloads/autoloader.php'; |
|
59 | 59 | |
60 | 60 | /** @var Wggithub\Helper $helper */ |
61 | 61 | /** @var Wggithub\Utility $utility */ |
@@ -79,14 +79,14 @@ discard block |
||
79 | 79 | |
80 | 80 | // --- COPY blank.gif FILES --------------- |
81 | 81 | if ($configurator->copyBlankFiles && \is_array($configurator->copyBlankFiles)) { |
82 | - $file = \dirname(__DIR__) . '/assets/images/blank.gif'; |
|
82 | + $file = \dirname(__DIR__).'/assets/images/blank.gif'; |
|
83 | 83 | foreach (\array_keys($configurator->copyBlankFiles) as $i) { |
84 | - $dest = $configurator->copyBlankFiles[$i] . '/blank.gif'; |
|
84 | + $dest = $configurator->copyBlankFiles[$i].'/blank.gif'; |
|
85 | 85 | $utility::copyFile($file, $dest); |
86 | 86 | } |
87 | - $file = \dirname(__DIR__) . '/assets/images/blank.png'; |
|
87 | + $file = \dirname(__DIR__).'/assets/images/blank.png'; |
|
88 | 88 | foreach (\array_keys($configurator->copyBlankFiles) as $i) { |
89 | - $dest = $configurator->copyBlankFiles[$i] . '/blank.png'; |
|
89 | + $dest = $configurator->copyBlankFiles[$i].'/blank.png'; |
|
90 | 90 | $utility::copyFile($file, $dest); |
91 | 91 | } |
92 | 92 | } |
@@ -20,10 +20,10 @@ |
||
20 | 20 | * @author Goffy - XOOPS Development Team - Email:<[email protected]> - Website:<https://wedega.com> |
21 | 21 | */ |
22 | 22 | if (!\defined('XOOPS_ICONS32_PATH')) { |
23 | - \define('XOOPS_ICONS32_PATH', XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'); |
|
23 | + \define('XOOPS_ICONS32_PATH', XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'); |
|
24 | 24 | } |
25 | 25 | if (!\defined('XOOPS_ICONS32_URL')) { |
26 | - \define('XOOPS_ICONS32_URL', XOOPS_URL . '/Frameworks/moduleclasses/icons/32'); |
|
26 | + \define('XOOPS_ICONS32_URL', XOOPS_URL . '/Frameworks/moduleclasses/icons/32'); |
|
27 | 27 | } |
28 | 28 | \define('WGGITHUB_DIRNAME', 'wggithub'); |
29 | 29 | \define('WGGITHUB_PATH', XOOPS_ROOT_PATH . '/modules/' . WGGITHUB_DIRNAME); |
@@ -20,29 +20,29 @@ |
||
20 | 20 | * @author Goffy - XOOPS Development Team - Email:<[email protected]> - Website:<https://wedega.com> |
21 | 21 | */ |
22 | 22 | if (!\defined('XOOPS_ICONS32_PATH')) { |
23 | - \define('XOOPS_ICONS32_PATH', XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'); |
|
23 | + \define('XOOPS_ICONS32_PATH', XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/icons/32'); |
|
24 | 24 | } |
25 | 25 | if (!\defined('XOOPS_ICONS32_URL')) { |
26 | - \define('XOOPS_ICONS32_URL', XOOPS_URL . '/Frameworks/moduleclasses/icons/32'); |
|
26 | + \define('XOOPS_ICONS32_URL', XOOPS_URL.'/Frameworks/moduleclasses/icons/32'); |
|
27 | 27 | } |
28 | 28 | \define('WGGITHUB_DIRNAME', 'wggithub'); |
29 | -\define('WGGITHUB_PATH', XOOPS_ROOT_PATH . '/modules/' . WGGITHUB_DIRNAME); |
|
30 | -\define('WGGITHUB_URL', XOOPS_URL . '/modules/' . WGGITHUB_DIRNAME); |
|
31 | -\define('WGGITHUB_ICONS_PATH', WGGITHUB_PATH . '/assets/icons'); |
|
32 | -\define('WGGITHUB_ICONS_URL', WGGITHUB_URL . '/assets/icons'); |
|
33 | -\define('WGGITHUB_IMAGE_PATH', WGGITHUB_PATH . '/assets/images'); |
|
34 | -\define('WGGITHUB_IMAGE_URL', WGGITHUB_URL . '/assets/images'); |
|
35 | -\define('WGGITHUB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . WGGITHUB_DIRNAME); |
|
36 | -\define('WGGITHUB_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . WGGITHUB_DIRNAME); |
|
37 | -\define('WGGITHUB_UPLOAD_FILES_PATH', WGGITHUB_UPLOAD_PATH . '/files'); |
|
38 | -\define('WGGITHUB_UPLOAD_FILES_URL', WGGITHUB_UPLOAD_URL . '/files'); |
|
39 | -\define('WGGITHUB_UPLOAD_IMAGE_PATH', WGGITHUB_UPLOAD_PATH . '/images'); |
|
40 | -\define('WGGITHUB_UPLOAD_IMAGE_URL', WGGITHUB_UPLOAD_URL . '/images'); |
|
41 | -\define('WGGITHUB_UPLOAD_SHOTS_PATH', WGGITHUB_UPLOAD_PATH . '/images/shots'); |
|
42 | -\define('WGGITHUB_UPLOAD_SHOTS_URL', WGGITHUB_UPLOAD_URL . '/images/shots'); |
|
43 | -\define('WGGITHUB_ADMIN', WGGITHUB_URL . '/admin/index.php'); |
|
44 | -$localLogo = WGGITHUB_IMAGE_URL . '/tdmxoops_logo.png'; |
|
29 | +\define('WGGITHUB_PATH', XOOPS_ROOT_PATH.'/modules/'.WGGITHUB_DIRNAME); |
|
30 | +\define('WGGITHUB_URL', XOOPS_URL.'/modules/'.WGGITHUB_DIRNAME); |
|
31 | +\define('WGGITHUB_ICONS_PATH', WGGITHUB_PATH.'/assets/icons'); |
|
32 | +\define('WGGITHUB_ICONS_URL', WGGITHUB_URL.'/assets/icons'); |
|
33 | +\define('WGGITHUB_IMAGE_PATH', WGGITHUB_PATH.'/assets/images'); |
|
34 | +\define('WGGITHUB_IMAGE_URL', WGGITHUB_URL.'/assets/images'); |
|
35 | +\define('WGGITHUB_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.WGGITHUB_DIRNAME); |
|
36 | +\define('WGGITHUB_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.WGGITHUB_DIRNAME); |
|
37 | +\define('WGGITHUB_UPLOAD_FILES_PATH', WGGITHUB_UPLOAD_PATH.'/files'); |
|
38 | +\define('WGGITHUB_UPLOAD_FILES_URL', WGGITHUB_UPLOAD_URL.'/files'); |
|
39 | +\define('WGGITHUB_UPLOAD_IMAGE_PATH', WGGITHUB_UPLOAD_PATH.'/images'); |
|
40 | +\define('WGGITHUB_UPLOAD_IMAGE_URL', WGGITHUB_UPLOAD_URL.'/images'); |
|
41 | +\define('WGGITHUB_UPLOAD_SHOTS_PATH', WGGITHUB_UPLOAD_PATH.'/images/shots'); |
|
42 | +\define('WGGITHUB_UPLOAD_SHOTS_URL', WGGITHUB_UPLOAD_URL.'/images/shots'); |
|
43 | +\define('WGGITHUB_ADMIN', WGGITHUB_URL.'/admin/index.php'); |
|
44 | +$localLogo = WGGITHUB_IMAGE_URL.'/tdmxoops_logo.png'; |
|
45 | 45 | // Module Information |
46 | -$copyright = "<a href='https://wedega.com' title='XOOPS on Wedega' target='_blank'><img src='" . $localLogo . "' alt='XOOPS on Wedega' /></a>"; |
|
47 | -include_once XOOPS_ROOT_PATH . '/class/xoopsrequest.php'; |
|
48 | -include_once WGGITHUB_PATH . '/include/functions.php'; |
|
46 | +$copyright = "<a href='https://wedega.com' title='XOOPS on Wedega' target='_blank'><img src='".$localLogo."' alt='XOOPS on Wedega' /></a>"; |
|
47 | +include_once XOOPS_ROOT_PATH.'/class/xoopsrequest.php'; |
|
48 | +include_once WGGITHUB_PATH.'/include/functions.php'; |
@@ -52,7 +52,7 @@ |
||
52 | 52 | if ($dirInfo->isDir()) { |
53 | 53 | // The directory exists so delete it |
54 | 54 | if (!$utility::rrmdir($old_dir)) { |
55 | - $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir)); |
|
55 | + $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $old_dir)); |
|
56 | 56 | $success = false; |
57 | 57 | } |
58 | 58 | } |
@@ -28,16 +28,16 @@ discard block |
||
28 | 28 | */ |
29 | 29 | function wggithub_block_addCatSelect($cats) |
30 | 30 | { |
31 | - $cat_sql = '('; |
|
32 | - if (\is_array($cats)) { |
|
33 | - $cat_sql .= current($cats); |
|
34 | - array_shift($cats); |
|
35 | - foreach ($cats as $cat) { |
|
36 | - $cat_sql .= ',' . $cat; |
|
37 | - } |
|
38 | - } |
|
39 | - $cat_sql .= ')'; |
|
40 | - return $cat_sql; |
|
31 | + $cat_sql = '('; |
|
32 | + if (\is_array($cats)) { |
|
33 | + $cat_sql .= current($cats); |
|
34 | + array_shift($cats); |
|
35 | + foreach ($cats as $cat) { |
|
36 | + $cat_sql .= ',' . $cat; |
|
37 | + } |
|
38 | + } |
|
39 | + $cat_sql .= ')'; |
|
40 | + return $cat_sql; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -49,17 +49,17 @@ discard block |
||
49 | 49 | */ |
50 | 50 | function wggithubGetMyItemIds($permtype, $dirname) |
51 | 51 | { |
52 | - global $xoopsUser; |
|
53 | - static $permissions = []; |
|
54 | - if (\is_array($permissions) && \array_key_exists($permtype, $permissions)) { |
|
55 | - return $permissions[$permtype]; |
|
56 | - } |
|
57 | - $moduleHandler = \xoops_getHandler('module'); |
|
58 | - $wggithubModule = $moduleHandler->getByDirname($dirname); |
|
59 | - $groups = \is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS; |
|
60 | - $grouppermHandler = \xoops_getHandler('groupperm'); |
|
61 | - $itemIds = $grouppermHandler->getItemIds($permtype, $groups, $wggithubModule->getVar('mid')); |
|
62 | - return $itemIds; |
|
52 | + global $xoopsUser; |
|
53 | + static $permissions = []; |
|
54 | + if (\is_array($permissions) && \array_key_exists($permtype, $permissions)) { |
|
55 | + return $permissions[$permtype]; |
|
56 | + } |
|
57 | + $moduleHandler = \xoops_getHandler('module'); |
|
58 | + $wggithubModule = $moduleHandler->getByDirname($dirname); |
|
59 | + $groups = \is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS; |
|
60 | + $grouppermHandler = \xoops_getHandler('groupperm'); |
|
61 | + $itemIds = $grouppermHandler->getItemIds($permtype, $groups, $wggithubModule->getVar('mid')); |
|
62 | + return $itemIds; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | |
134 | 134 | case 'none': |
135 | 135 | if($topic_name) { |
136 | - $topic_name = 'topic=' . $topic_name . '&'; |
|
136 | + $topic_name = 'topic=' . $topic_name . '&'; |
|
137 | 137 | } |
138 | 138 | $rewrite_base = '/modules/'; |
139 | 139 | $page = 'page=' . $array['content_alias']; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | return XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $id . $page . $rewrite_ext; |
164 | 164 | break; |
165 | 165 | |
166 | - case 'short': |
|
166 | + case 'short': |
|
167 | 167 | if($topic_name) { |
168 | 168 | $topic_name .= '/'; |
169 | 169 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $cat_sql .= current($cats); |
34 | 34 | array_shift($cats); |
35 | 35 | foreach ($cats as $cat) { |
36 | - $cat_sql .= ',' . $cat; |
|
36 | + $cat_sql .= ','.$cat; |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 | $cat_sql .= ')'; |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | { |
73 | 73 | global $xoopsTpl, $xoTheme; |
74 | 74 | $myts = MyTextSanitizer::getInstance(); |
75 | - $content= $myts->undoHtmlSpecialChars($myts->displayTarea($content)); |
|
76 | - if(isset($xoTheme) && \is_object($xoTheme)) { |
|
77 | - $xoTheme->addMeta( 'meta', 'keywords', \strip_tags($content)); |
|
75 | + $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content)); |
|
76 | + if (isset($xoTheme) && \is_object($xoTheme)) { |
|
77 | + $xoTheme->addMeta('meta', 'keywords', \strip_tags($content)); |
|
78 | 78 | } else { // Compatibility for old Xoops versions |
79 | 79 | $xoopsTpl->assign('xoops_meta_keywords', \strip_tags($content)); |
80 | 80 | } |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | global $xoopsTpl, $xoTheme; |
92 | 92 | $myts = MyTextSanitizer::getInstance(); |
93 | 93 | $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content)); |
94 | - if(isset($xoTheme) && \is_object($xoTheme)) { |
|
95 | - $xoTheme->addMeta( 'meta', 'description', \strip_tags($content)); |
|
94 | + if (isset($xoTheme) && \is_object($xoTheme)) { |
|
95 | + $xoTheme->addMeta('meta', 'description', \strip_tags($content)); |
|
96 | 96 | } else { // Compatibility for old Xoops versions |
97 | 97 | $xoopsTpl->assign('xoops_meta_description', \strip_tags($content)); |
98 | 98 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | if (0 != $lenght_id) { |
118 | 118 | $id = $array['content_id']; |
119 | 119 | while (\strlen($id) < $lenght_id) { |
120 | - $id = '0' . $id; |
|
120 | + $id = '0'.$id; |
|
121 | 121 | } |
122 | 122 | } else { |
123 | 123 | $id = $array['content_id']; |
@@ -132,23 +132,23 @@ discard block |
||
132 | 132 | switch ($rewrite_url) { |
133 | 133 | |
134 | 134 | case 'none': |
135 | - if($topic_name) { |
|
136 | - $topic_name = 'topic=' . $topic_name . '&'; |
|
135 | + if ($topic_name) { |
|
136 | + $topic_name = 'topic='.$topic_name.'&'; |
|
137 | 137 | } |
138 | 138 | $rewrite_base = '/modules/'; |
139 | - $page = 'page=' . $array['content_alias']; |
|
140 | - return XOOPS_URL . $rewrite_base . $module . '/' . $type . '.php?' . $topic_name . 'id=' . $id . '&' . $page . $comment; |
|
139 | + $page = 'page='.$array['content_alias']; |
|
140 | + return XOOPS_URL.$rewrite_base.$module.'/'.$type.'.php?'.$topic_name.'id='.$id.'&'.$page.$comment; |
|
141 | 141 | break; |
142 | 142 | |
143 | 143 | case 'rewrite': |
144 | - if($topic_name) { |
|
144 | + if ($topic_name) { |
|
145 | 145 | $topic_name .= '/'; |
146 | 146 | } |
147 | 147 | $rewrite_base = xoops_getModuleOption('rewrite_mode', $module); |
148 | 148 | $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module); |
149 | 149 | $module_name = ''; |
150 | - if(xoops_getModuleOption('rewrite_name', $module)) { |
|
151 | - $module_name = xoops_getModuleOption('rewrite_name', $module) . '/'; |
|
150 | + if (xoops_getModuleOption('rewrite_name', $module)) { |
|
151 | + $module_name = xoops_getModuleOption('rewrite_name', $module).'/'; |
|
152 | 152 | } |
153 | 153 | $page = $array['content_alias']; |
154 | 154 | $type .= '/'; |
@@ -157,21 +157,21 @@ discard block |
||
157 | 157 | $type = ''; |
158 | 158 | } |
159 | 159 | if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) { |
160 | - return XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/'; |
|
160 | + return XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/'; |
|
161 | 161 | } |
162 | 162 | |
163 | - return XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $id . $page . $rewrite_ext; |
|
163 | + return XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$id.$page.$rewrite_ext; |
|
164 | 164 | break; |
165 | 165 | |
166 | 166 | case 'short': |
167 | - if($topic_name) { |
|
167 | + if ($topic_name) { |
|
168 | 168 | $topic_name .= '/'; |
169 | 169 | } |
170 | 170 | $rewrite_base = xoops_getModuleOption('rewrite_mode', $module); |
171 | 171 | $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module); |
172 | 172 | $module_name = ''; |
173 | - if(xoops_getModuleOption('rewrite_name', $module)) { |
|
174 | - $module_name = xoops_getModuleOption('rewrite_name', $module) . '/'; |
|
173 | + if (xoops_getModuleOption('rewrite_name', $module)) { |
|
174 | + $module_name = xoops_getModuleOption('rewrite_name', $module).'/'; |
|
175 | 175 | } |
176 | 176 | $page = $array['content_alias']; |
177 | 177 | $type .= '/'; |
@@ -179,10 +179,10 @@ discard block |
||
179 | 179 | $type = ''; |
180 | 180 | } |
181 | 181 | if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) { |
182 | - return XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/'; |
|
182 | + return XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/'; |
|
183 | 183 | } |
184 | 184 | |
185 | - return XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $page . $rewrite_ext; |
|
185 | + return XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$page.$rewrite_ext; |
|
186 | 186 | break; |
187 | 187 | } |
188 | 188 | return null; |
@@ -207,6 +207,6 @@ discard block |
||
207 | 207 | $url .= htmlentities($url, ENT_COMPAT, 'utf-8'); |
208 | 208 | $url .= \preg_replace('`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig);`i', "\1", $url); |
209 | 209 | $url .= \preg_replace(array($regular_expression, '`[-]+`'), '-', $url); |
210 | - $url = ($url == '') ? $type : strtolower( rim($url, '-')); |
|
210 | + $url = ($url == '') ? $type : strtolower(rim($url, '-')); |
|
211 | 211 | return $url; |
212 | 212 | } |
213 | 213 | \ No newline at end of file |
@@ -18,8 +18,8 @@ discard block |
||
18 | 18 | use XoopsModules\Wggithub\Common; |
19 | 19 | use XoopsModules\Wggithub\Utility; |
20 | 20 | |
21 | -require_once dirname(__DIR__, 3) . '/include/cp_header.php'; |
|
22 | -require \dirname(__DIR__) . '/preloads/autoloader.php'; |
|
21 | +require_once dirname(__DIR__, 3).'/include/cp_header.php'; |
|
22 | +require \dirname(__DIR__).'/preloads/autoloader.php'; |
|
23 | 23 | |
24 | 24 | $op = \Xmf\Request::getCmd('op', ''); |
25 | 25 | |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | loadSampleData(); |
40 | 40 | } else { |
41 | 41 | xoops_cp_header(); |
42 | - xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA_OK')), \constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true); |
|
42 | + xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', \sprintf(\constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA_OK')), \constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true); |
|
43 | 43 | xoops_cp_footer(); |
44 | 44 | } |
45 | 45 | break; |
@@ -63,12 +63,12 @@ discard block |
||
63 | 63 | $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables'); |
64 | 64 | |
65 | 65 | $language = 'english/'; |
66 | - if (\is_dir(__DIR__ . '/' . $xoopsConfig['language'])) { |
|
67 | - $language = $xoopsConfig['language'] . '/'; |
|
66 | + if (\is_dir(__DIR__.'/'.$xoopsConfig['language'])) { |
|
67 | + $language = $xoopsConfig['language'].'/'; |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | foreach ($tables as $table) { |
71 | - $tabledata = \Xmf\Yaml::readWrapped($language . $table . '.yml'); |
|
71 | + $tabledata = \Xmf\Yaml::readWrapped($language.$table.'.yml'); |
|
72 | 72 | \Xmf\Database\TableLoad::truncateTable($table); |
73 | 73 | \Xmf\Database\TableLoad::loadTableFromArray($table, $tabledata); |
74 | 74 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $utility::rcopy($src, $dest); |
83 | 83 | } |
84 | 84 | } |
85 | - \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS')); |
|
85 | + \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS')); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | function saveSampleData() |
@@ -96,15 +96,15 @@ discard block |
||
96 | 96 | |
97 | 97 | $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables'); |
98 | 98 | |
99 | - $languageFolder = __DIR__ . '/' . $xoopsConfig['language']; |
|
100 | - if (!\file_exists($languageFolder . '/')) { |
|
101 | - Utility::createFolder($languageFolder . '/'); |
|
99 | + $languageFolder = __DIR__.'/'.$xoopsConfig['language']; |
|
100 | + if (!\file_exists($languageFolder.'/')) { |
|
101 | + Utility::createFolder($languageFolder.'/'); |
|
102 | 102 | } |
103 | - $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/'; |
|
103 | + $exportFolder = $languageFolder.'/Exports-'.date('Y-m-d-H-i-s').'/'; |
|
104 | 104 | Utility::createFolder($exportFolder); |
105 | 105 | |
106 | 106 | foreach ($tables as $table) { |
107 | - \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml'); |
|
107 | + \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder.$table.'.yml'); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | // --- COPY test folder files --------------- |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | Utility::rcopy($src, $dest); |
116 | 116 | } |
117 | 117 | } |
118 | - \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS')); |
|
118 | + \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA_SUCCESS')); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | function exportSchema() |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | // \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS')); |
132 | 132 | } |
133 | 133 | catch (\Exception $e) { |
134 | - exit(\constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR')); |
|
134 | + exit(\constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR')); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | } |
138 | 138 | \ No newline at end of file |
@@ -129,8 +129,7 @@ |
||
129 | 129 | // $migrate->saveCurrentSchema(); |
130 | 130 | // |
131 | 131 | // \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS')); |
132 | - } |
|
133 | - catch (\Exception $e) { |
|
132 | + } catch (\Exception $e) { |
|
134 | 133 | exit(\constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR')); |
135 | 134 | } |
136 | 135 |
@@ -27,7 +27,7 @@ |
||
27 | 27 | */ |
28 | 28 | public function doHandleRequest(RequestInterface $request, callable $next, callable $first) |
29 | 29 | { |
30 | - return $next($request)->then(function (ResponseInterface $response) use ($request) { |
|
30 | + return $next($request)->then(function(ResponseInterface $response) use ($request) { |
|
31 | 31 | if ($response->getStatusCode() < 400 || $response->getStatusCode() > 600) { |
32 | 32 | return $response; |
33 | 33 | } |