@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | use XoopsModules\Wggithub; |
25 | 25 | use XoopsModules\Wggithub\Constants; |
26 | 26 | |
27 | -require __DIR__ . '/header.php'; |
|
27 | +require __DIR__.'/header.php'; |
|
28 | 28 | |
29 | 29 | // Template Index |
30 | 30 | $templateMain = 'wggithub_admin_permissions.tpl'; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $op = Request::getCmd('op', 'global'); |
34 | 34 | |
35 | 35 | // Get Form |
36 | -include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php'; |
|
36 | +include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php'; |
|
37 | 37 | \xoops_load('XoopsFormLoader'); |
38 | 38 | |
39 | 39 | $formTitle = \_AM_WGGITHUB_PERMISSIONS_GLOBAL; |
@@ -61,4 +61,4 @@ discard block |
||
61 | 61 | exit(); |
62 | 62 | } |
63 | 63 | |
64 | -require __DIR__ . '/footer.php'; |
|
64 | +require __DIR__.'/footer.php'; |
@@ -31,109 +31,109 @@ |
||
31 | 31 | // Request dir_id |
32 | 32 | $dirId = Request::getInt('dir_id'); |
33 | 33 | switch ($op) { |
34 | - case 'list': |
|
35 | - default: |
|
36 | - // Define Stylesheet |
|
37 | - $GLOBALS['xoTheme']->addStylesheet($style, null); |
|
38 | - $start = Request::getInt('start', 0); |
|
39 | - $limit = Request::getInt('limit', $helper->getConfig('adminpager')); |
|
40 | - $templateMain = 'wggithub_admin_directories.tpl'; |
|
41 | - $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('directories.php')); |
|
42 | - $adminObject->addItemButton(_AM_WGGITHUB_ADD_DIRECTORY, 'directories.php?op=new', 'add'); |
|
43 | - $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left')); |
|
44 | - $directoriesCount = $directoriesHandler->getCountDirectories(); |
|
45 | - $directoriesAll = $directoriesHandler->getAllDirectories($start, $limit); |
|
46 | - $GLOBALS['xoopsTpl']->assign('directories_count', $directoriesCount); |
|
47 | - $GLOBALS['xoopsTpl']->assign('wggithub_url', WGGITHUB_URL); |
|
48 | - $GLOBALS['xoopsTpl']->assign('wggithub_upload_url', WGGITHUB_UPLOAD_URL); |
|
49 | - // Table view directories |
|
50 | - if ($directoriesCount > 0) { |
|
51 | - foreach (\array_keys($directoriesAll) as $i) { |
|
52 | - $directory = $directoriesAll[$i]->getValuesDirectories(); |
|
53 | - $GLOBALS['xoopsTpl']->append('directories_list', $directory); |
|
54 | - unset($directory); |
|
55 | - } |
|
56 | - // Display Navigation |
|
57 | - if ($directoriesCount > $limit) { |
|
58 | - include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; |
|
59 | - $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); |
|
60 | - $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); |
|
61 | - } |
|
62 | - } else { |
|
63 | - $GLOBALS['xoopsTpl']->assign('error', _AM_WGGITHUB_THEREARENT_DIRECTORIES); |
|
64 | - } |
|
65 | - break; |
|
66 | - case 'new': |
|
67 | - $templateMain = 'wggithub_admin_directories.tpl'; |
|
68 | - $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('directories.php')); |
|
69 | - $adminObject->addItemButton(_AM_WGGITHUB_DIRECTORIES_LIST, 'directories.php', 'list'); |
|
70 | - $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left')); |
|
71 | - // Form Create |
|
72 | - $directoriesObj = $directoriesHandler->create(); |
|
73 | - $form = $directoriesObj->getFormDirectories(); |
|
74 | - $GLOBALS['xoopsTpl']->assign('form', $form->render()); |
|
75 | - break; |
|
76 | - case 'save': |
|
77 | - // Security Check |
|
78 | - if (!$GLOBALS['xoopsSecurity']->check()) { |
|
79 | - \redirect_header('directories.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors())); |
|
80 | - } |
|
81 | - if ($dirId > 0) { |
|
82 | - $directoriesObj = $directoriesHandler->get($dirId); |
|
83 | - } else { |
|
84 | - $directoriesObj = $directoriesHandler->create(); |
|
85 | - } |
|
86 | - // Set Vars |
|
87 | - $directoriesObj->setVar('dir_name', Request::getString('dir_name', '')); |
|
88 | - $directoriesObj->setVar('dir_type', Request::getInt('dir_type', 0)); |
|
89 | - $directoriesObj->setVar('dir_autoupdate', Request::getInt('dir_autoupdate', 0)); |
|
90 | - $directoriesObj->setVar('dir_online', Request::getInt('dir_online', 0)); |
|
34 | + case 'list': |
|
35 | + default: |
|
36 | + // Define Stylesheet |
|
37 | + $GLOBALS['xoTheme']->addStylesheet($style, null); |
|
38 | + $start = Request::getInt('start', 0); |
|
39 | + $limit = Request::getInt('limit', $helper->getConfig('adminpager')); |
|
40 | + $templateMain = 'wggithub_admin_directories.tpl'; |
|
41 | + $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('directories.php')); |
|
42 | + $adminObject->addItemButton(_AM_WGGITHUB_ADD_DIRECTORY, 'directories.php?op=new', 'add'); |
|
43 | + $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left')); |
|
44 | + $directoriesCount = $directoriesHandler->getCountDirectories(); |
|
45 | + $directoriesAll = $directoriesHandler->getAllDirectories($start, $limit); |
|
46 | + $GLOBALS['xoopsTpl']->assign('directories_count', $directoriesCount); |
|
47 | + $GLOBALS['xoopsTpl']->assign('wggithub_url', WGGITHUB_URL); |
|
48 | + $GLOBALS['xoopsTpl']->assign('wggithub_upload_url', WGGITHUB_UPLOAD_URL); |
|
49 | + // Table view directories |
|
50 | + if ($directoriesCount > 0) { |
|
51 | + foreach (\array_keys($directoriesAll) as $i) { |
|
52 | + $directory = $directoriesAll[$i]->getValuesDirectories(); |
|
53 | + $GLOBALS['xoopsTpl']->append('directories_list', $directory); |
|
54 | + unset($directory); |
|
55 | + } |
|
56 | + // Display Navigation |
|
57 | + if ($directoriesCount > $limit) { |
|
58 | + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; |
|
59 | + $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); |
|
60 | + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); |
|
61 | + } |
|
62 | + } else { |
|
63 | + $GLOBALS['xoopsTpl']->assign('error', _AM_WGGITHUB_THEREARENT_DIRECTORIES); |
|
64 | + } |
|
65 | + break; |
|
66 | + case 'new': |
|
67 | + $templateMain = 'wggithub_admin_directories.tpl'; |
|
68 | + $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('directories.php')); |
|
69 | + $adminObject->addItemButton(_AM_WGGITHUB_DIRECTORIES_LIST, 'directories.php', 'list'); |
|
70 | + $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left')); |
|
71 | + // Form Create |
|
72 | + $directoriesObj = $directoriesHandler->create(); |
|
73 | + $form = $directoriesObj->getFormDirectories(); |
|
74 | + $GLOBALS['xoopsTpl']->assign('form', $form->render()); |
|
75 | + break; |
|
76 | + case 'save': |
|
77 | + // Security Check |
|
78 | + if (!$GLOBALS['xoopsSecurity']->check()) { |
|
79 | + \redirect_header('directories.php', 3, \implode(',', $GLOBALS['xoopsSecurity']->getErrors())); |
|
80 | + } |
|
81 | + if ($dirId > 0) { |
|
82 | + $directoriesObj = $directoriesHandler->get($dirId); |
|
83 | + } else { |
|
84 | + $directoriesObj = $directoriesHandler->create(); |
|
85 | + } |
|
86 | + // Set Vars |
|
87 | + $directoriesObj->setVar('dir_name', Request::getString('dir_name', '')); |
|
88 | + $directoriesObj->setVar('dir_type', Request::getInt('dir_type', 0)); |
|
89 | + $directoriesObj->setVar('dir_autoupdate', Request::getInt('dir_autoupdate', 0)); |
|
90 | + $directoriesObj->setVar('dir_online', Request::getInt('dir_online', 0)); |
|
91 | 91 | $directoriesObj->setVar('dir_filterrelease', Request::getInt('dir_filterrelease', 0)); |
92 | - $directoryDatecreatedObj = \DateTime::createFromFormat(_SHORTDATESTRING, Request::getString('dir_datecreated')); |
|
93 | - $directoriesObj->setVar('dir_datecreated', $directoryDatecreatedObj->getTimestamp()); |
|
94 | - $directoriesObj->setVar('dir_submitter', Request::getInt('dir_submitter', 0)); |
|
95 | - // Insert Data |
|
96 | - if ($directoriesHandler->insert($directoriesObj)) { |
|
97 | - \redirect_header('directories.php?op=list', 2, _AM_WGGITHUB_FORM_OK); |
|
98 | - } |
|
99 | - // Get Form |
|
100 | - $GLOBALS['xoopsTpl']->assign('error', $directoriesObj->getHtmlErrors()); |
|
101 | - $form = $directoriesObj->getFormDirectories(); |
|
102 | - $GLOBALS['xoopsTpl']->assign('form', $form->render()); |
|
103 | - break; |
|
104 | - case 'edit': |
|
105 | - $templateMain = 'wggithub_admin_directories.tpl'; |
|
106 | - $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('directories.php')); |
|
107 | - $adminObject->addItemButton(_AM_WGGITHUB_ADD_DIRECTORY, 'directories.php?op=new', 'add'); |
|
108 | - $adminObject->addItemButton(_AM_WGGITHUB_DIRECTORIES_LIST, 'directories.php', 'list'); |
|
109 | - $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left')); |
|
110 | - // Get Form |
|
111 | - $directoriesObj = $directoriesHandler->get($dirId); |
|
112 | - $form = $directoriesObj->getFormDirectories(); |
|
113 | - $GLOBALS['xoopsTpl']->assign('form', $form->render()); |
|
114 | - break; |
|
115 | - case 'delete': |
|
116 | - $templateMain = 'wggithub_admin_directories.tpl'; |
|
117 | - $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('directories.php')); |
|
118 | - $directoriesObj = $directoriesHandler->get($dirId); |
|
119 | - $dirName = $directoriesObj->getVar('dir_name'); |
|
120 | - if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) { |
|
121 | - if (!$GLOBALS['xoopsSecurity']->check()) { |
|
122 | - \redirect_header('directories.php', 3, \implode(', ', $GLOBALS['xoopsSecurity']->getErrors())); |
|
123 | - } |
|
124 | - if ($directoriesHandler->delete($directoriesObj)) { |
|
125 | - \redirect_header('directories.php', 3, _AM_WGGITHUB_FORM_DELETE_OK); |
|
126 | - } else { |
|
127 | - $GLOBALS['xoopsTpl']->assign('error', $directoriesObj->getHtmlErrors()); |
|
128 | - } |
|
129 | - } else { |
|
130 | - $xoopsconfirm = new Common\XoopsConfirm( |
|
131 | - ['ok' => 1, 'dir_id' => $dirId, 'op' => 'delete'], |
|
132 | - $_SERVER['REQUEST_URI'], |
|
133 | - \sprintf(_AM_WGGITHUB_FORM_SURE_DELETE, $directoriesObj->getVar('dir_name'))); |
|
134 | - $form = $xoopsconfirm->getFormXoopsConfirm(); |
|
135 | - $GLOBALS['xoopsTpl']->assign('form', $form->render()); |
|
136 | - } |
|
137 | - break; |
|
92 | + $directoryDatecreatedObj = \DateTime::createFromFormat(_SHORTDATESTRING, Request::getString('dir_datecreated')); |
|
93 | + $directoriesObj->setVar('dir_datecreated', $directoryDatecreatedObj->getTimestamp()); |
|
94 | + $directoriesObj->setVar('dir_submitter', Request::getInt('dir_submitter', 0)); |
|
95 | + // Insert Data |
|
96 | + if ($directoriesHandler->insert($directoriesObj)) { |
|
97 | + \redirect_header('directories.php?op=list', 2, _AM_WGGITHUB_FORM_OK); |
|
98 | + } |
|
99 | + // Get Form |
|
100 | + $GLOBALS['xoopsTpl']->assign('error', $directoriesObj->getHtmlErrors()); |
|
101 | + $form = $directoriesObj->getFormDirectories(); |
|
102 | + $GLOBALS['xoopsTpl']->assign('form', $form->render()); |
|
103 | + break; |
|
104 | + case 'edit': |
|
105 | + $templateMain = 'wggithub_admin_directories.tpl'; |
|
106 | + $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('directories.php')); |
|
107 | + $adminObject->addItemButton(_AM_WGGITHUB_ADD_DIRECTORY, 'directories.php?op=new', 'add'); |
|
108 | + $adminObject->addItemButton(_AM_WGGITHUB_DIRECTORIES_LIST, 'directories.php', 'list'); |
|
109 | + $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left')); |
|
110 | + // Get Form |
|
111 | + $directoriesObj = $directoriesHandler->get($dirId); |
|
112 | + $form = $directoriesObj->getFormDirectories(); |
|
113 | + $GLOBALS['xoopsTpl']->assign('form', $form->render()); |
|
114 | + break; |
|
115 | + case 'delete': |
|
116 | + $templateMain = 'wggithub_admin_directories.tpl'; |
|
117 | + $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('directories.php')); |
|
118 | + $directoriesObj = $directoriesHandler->get($dirId); |
|
119 | + $dirName = $directoriesObj->getVar('dir_name'); |
|
120 | + if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) { |
|
121 | + if (!$GLOBALS['xoopsSecurity']->check()) { |
|
122 | + \redirect_header('directories.php', 3, \implode(', ', $GLOBALS['xoopsSecurity']->getErrors())); |
|
123 | + } |
|
124 | + if ($directoriesHandler->delete($directoriesObj)) { |
|
125 | + \redirect_header('directories.php', 3, _AM_WGGITHUB_FORM_DELETE_OK); |
|
126 | + } else { |
|
127 | + $GLOBALS['xoopsTpl']->assign('error', $directoriesObj->getHtmlErrors()); |
|
128 | + } |
|
129 | + } else { |
|
130 | + $xoopsconfirm = new Common\XoopsConfirm( |
|
131 | + ['ok' => 1, 'dir_id' => $dirId, 'op' => 'delete'], |
|
132 | + $_SERVER['REQUEST_URI'], |
|
133 | + \sprintf(_AM_WGGITHUB_FORM_SURE_DELETE, $directoriesObj->getVar('dir_name'))); |
|
134 | + $form = $xoopsconfirm->getFormXoopsConfirm(); |
|
135 | + $GLOBALS['xoopsTpl']->assign('form', $form->render()); |
|
136 | + } |
|
137 | + break; |
|
138 | 138 | } |
139 | 139 | require __DIR__ . '/footer.php'; |
@@ -30,9 +30,9 @@ discard block |
||
30 | 30 | Github\Releases, |
31 | 31 | }; |
32 | 32 | |
33 | -require __DIR__ . '/header.php'; |
|
33 | +require __DIR__.'/header.php'; |
|
34 | 34 | $GLOBALS['xoopsOption']['template_main'] = 'wggithub_index.tpl'; |
35 | -include_once \XOOPS_ROOT_PATH . '/header.php'; |
|
35 | +include_once \XOOPS_ROOT_PATH.'/header.php'; |
|
36 | 36 | // Define Stylesheet |
37 | 37 | $GLOBALS['xoTheme']->addStylesheet($style, null); |
38 | 38 | $keywords = []; |
@@ -165,4 +165,4 @@ discard block |
||
165 | 165 | var_dump($result); |
166 | 166 | */ |
167 | 167 | |
168 | -require __DIR__ . '/footer.php'; |
|
168 | +require __DIR__.'/footer.php'; |
@@ -24,8 +24,8 @@ discard block |
||
24 | 24 | Utility |
25 | 25 | }; |
26 | 26 | |
27 | -require_once dirname(__DIR__, 3) . '/include/cp_header.php'; |
|
28 | -require \dirname(__DIR__) . '/preloads/autoloader.php'; |
|
27 | +require_once dirname(__DIR__, 3).'/include/cp_header.php'; |
|
28 | +require \dirname(__DIR__).'/preloads/autoloader.php'; |
|
29 | 29 | |
30 | 30 | $op = \Xmf\Request::getCmd('op', ''); |
31 | 31 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | loadSampleData(); |
46 | 46 | } else { |
47 | 47 | xoops_cp_header(); |
48 | - xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA_OK')), \constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true); |
|
48 | + xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', \sprintf(\constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA_OK')), \constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true); |
|
49 | 49 | xoops_cp_footer(); |
50 | 50 | } |
51 | 51 | break; |
@@ -68,20 +68,20 @@ discard block |
||
68 | 68 | $tables = Helper::getHelper($moduleDirName)->getModule()->getInfo('tables'); |
69 | 69 | |
70 | 70 | $language = 'english/'; |
71 | - if (\is_dir(__DIR__ . '/' . $xoopsConfig['language'])) { |
|
72 | - $language = $xoopsConfig['language'] . '/'; |
|
71 | + if (\is_dir(__DIR__.'/'.$xoopsConfig['language'])) { |
|
72 | + $language = $xoopsConfig['language'].'/'; |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | // load module tables |
76 | 76 | foreach ($tables as $table) { |
77 | - $tabledata = Yaml::readWrapped($language . $table . '.yml'); |
|
77 | + $tabledata = Yaml::readWrapped($language.$table.'.yml'); |
|
78 | 78 | TableLoad::truncateTable($table); |
79 | 79 | TableLoad::loadTableFromArray($table, $tabledata); |
80 | 80 | } |
81 | 81 | |
82 | 82 | // load permissions |
83 | 83 | $table = 'group_permission'; |
84 | - $tabledata = Yaml::readWrapped($language . $table . '.yml'); |
|
84 | + $tabledata = Yaml::readWrapped($language.$table.'.yml'); |
|
85 | 85 | $mid = Helper::getHelper($moduleDirName)->getModule()->getVar('mid'); |
86 | 86 | loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid); |
87 | 87 | |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $utility::rcopy($src, $dest); |
95 | 95 | } |
96 | 96 | } |
97 | - \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS')); |
|
97 | + \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS')); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | function saveSampleData() |
@@ -108,23 +108,23 @@ discard block |
||
108 | 108 | |
109 | 109 | $tables = Helper::getHelper($moduleDirName)->getModule()->getInfo('tables'); |
110 | 110 | |
111 | - $languageFolder = __DIR__ . '/' . $xoopsConfig['language']; |
|
112 | - if (!\file_exists($languageFolder . '/')) { |
|
113 | - Utility::createFolder($languageFolder . '/'); |
|
111 | + $languageFolder = __DIR__.'/'.$xoopsConfig['language']; |
|
112 | + if (!\file_exists($languageFolder.'/')) { |
|
113 | + Utility::createFolder($languageFolder.'/'); |
|
114 | 114 | } |
115 | - $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/'; |
|
115 | + $exportFolder = $languageFolder.'/Exports-'.date('Y-m-d-H-i-s').'/'; |
|
116 | 116 | Utility::createFolder($exportFolder); |
117 | 117 | |
118 | 118 | // save module tables |
119 | 119 | foreach ($tables as $table) { |
120 | - TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml'); |
|
120 | + TableLoad::saveTableToYamlFile($table, $exportFolder.$table.'.yml'); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | // save permissions |
124 | 124 | $criteria = new \CriteriaCompo(); |
125 | 125 | $criteria->add(new \Criteria('gperm_modid', Helper::getHelper($moduleDirName)->getModule()->getVar('mid'))); |
126 | 126 | $skipColumns[] = 'gperm_id'; |
127 | - TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns); |
|
127 | + TableLoad::saveTableToYamlFile('group_permission', $exportFolder.'group_permission.yml', $criteria, $skipColumns); |
|
128 | 128 | unset($criteria); |
129 | 129 | |
130 | 130 | // --- COPY test folder files --------------- |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | Utility::rcopy($src, $dest); |
136 | 136 | } |
137 | 137 | } |
138 | - \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS')); |
|
138 | + \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA_SUCCESS')); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | function exportSchema() |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | // |
151 | 151 | // \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS')); |
152 | 152 | } catch (\Exception $e) { |
153 | - exit(\constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR')); |
|
153 | + exit(\constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR')); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | } |
157 | 157 | \ No newline at end of file |
@@ -30,15 +30,15 @@ discard block |
||
30 | 30 | Github\Releases |
31 | 31 | }; |
32 | 32 | |
33 | -require __DIR__ . '/header.php'; |
|
33 | +require __DIR__.'/header.php'; |
|
34 | 34 | $GLOBALS['xoopsOption']['template_main'] = 'wggithub_index.tpl'; |
35 | -include_once \XOOPS_ROOT_PATH . '/header.php'; |
|
35 | +include_once \XOOPS_ROOT_PATH.'/header.php'; |
|
36 | 36 | |
37 | 37 | // Permissions |
38 | 38 | $permGlobalView = $permissionsHandler->getPermGlobalView(); |
39 | 39 | if (!$permGlobalView) { |
40 | 40 | $GLOBALS['xoopsTpl']->assign('error', _NOPERM); |
41 | - require __DIR__ . '/footer.php'; |
|
41 | + require __DIR__.'/footer.php'; |
|
42 | 42 | } |
43 | 43 | $permGlobalRead = $permissionsHandler->getPermGlobalRead(); |
44 | 44 | $permReadmeUpdate = $permissionsHandler->getPermReadmeUpdate(); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | |
53 | 53 | // Define Stylesheet |
54 | 54 | $GLOBALS['xoTheme']->addStylesheet($style, null); |
55 | -$GLOBALS['xoTheme']->addStylesheet(WGGITHUB_URL . '/assets/css/tabs.css', null); |
|
55 | +$GLOBALS['xoTheme']->addStylesheet(WGGITHUB_URL.'/assets/css/tabs.css', null); |
|
56 | 56 | $keywords = []; |
57 | 57 | // |
58 | 58 | $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL); |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | foreach (\array_keys($directoriesAll) as $i) { |
120 | 120 | $directories[$i] = $directoriesAll[$i]->getValuesDirectories(); |
121 | 121 | $dirName = $directoriesAll[$i]->getVar('dir_name'); |
122 | - $dirFilterRelease = (bool)$directoriesAll[$i]->getVar('dir_filterrelease'); |
|
122 | + $dirFilterRelease = (bool) $directoriesAll[$i]->getVar('dir_filterrelease'); |
|
123 | 123 | $repos = []; |
124 | 124 | if (Constants::DIRECTORY_TYPE_ORG == $directoriesAll[$i]->getVar('dir_type')) { |
125 | 125 | //$github->readOrgRepositories($dirName, 100, 1); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $crRepositories->add(new \Criteria('repo_user', $dirName)); |
132 | 132 | $repositoriesCountTotal = $repositoriesHandler->getCount($crRepositories); |
133 | 133 | if ('any' === $filterRelease && $dirFilterRelease) { |
134 | - $crRepositories->add(new \Criteria('repo_prerelease', 1) ); |
|
134 | + $crRepositories->add(new \Criteria('repo_prerelease', 1)); |
|
135 | 135 | $crRepositories->add(new \Criteria('repo_release', 1), 'OR'); |
136 | 136 | } |
137 | 137 | if ('final' === $filterRelease && $dirFilterRelease) { |
@@ -188,9 +188,9 @@ discard block |
||
188 | 188 | } |
189 | 189 | $directories[$i]['repos'] = $repos; |
190 | 190 | $directories[$i]['previousRepos'] = $start > 0; |
191 | - $directories[$i]['previousOp'] = '&start=' . ($start - $limit) . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby; |
|
191 | + $directories[$i]['previousOp'] = '&start='.($start - $limit).'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby; |
|
192 | 192 | $directories[$i]['nextRepos'] = ($repositoriesCount - $start) > $limit; |
193 | - $directories[$i]['nextOp'] = '&start=' . ($start + $limit) . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby; |
|
193 | + $directories[$i]['nextOp'] = '&start='.($start + $limit).'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby; |
|
194 | 194 | $GLOBALS['xoopsTpl']->assign('start', $start); |
195 | 195 | $GLOBALS['xoopsTpl']->assign('limit', $limit); |
196 | 196 | $GLOBALS['xoopsTpl']->assign('menu', $menu); |
@@ -201,8 +201,8 @@ discard block |
||
201 | 201 | unset($crDirectories, $directories); |
202 | 202 | // Display Navigation |
203 | 203 | if ($directoriesCount > $limit) { |
204 | - include_once \XOOPS_ROOT_PATH . '/class/pagenav.php'; |
|
205 | - $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); |
|
204 | + include_once \XOOPS_ROOT_PATH.'/class/pagenav.php'; |
|
205 | + $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit='.$limit); |
|
206 | 206 | $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); |
207 | 207 | } |
208 | 208 | $GLOBALS['xoopsTpl']->assign('lang_thereare', \sprintf(\_MA_WGGITHUB_INDEX_THEREARE, $directoriesCount)); |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | // Permissions |
216 | 216 | if (!$permGlobalRead) { |
217 | 217 | $GLOBALS['xoopsTpl']->assign('error', _NOPERM); |
218 | - require __DIR__ . '/footer.php'; |
|
218 | + require __DIR__.'/footer.php'; |
|
219 | 219 | } |
220 | 220 | executeUpdate(); |
221 | 221 | break; |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | // Permissions |
224 | 224 | if (!$permReadmeUpdate) { |
225 | 225 | $GLOBALS['xoopsTpl']->assign('error', _NOPERM); |
226 | - require __DIR__ . '/footer.php'; |
|
226 | + require __DIR__.'/footer.php'; |
|
227 | 227 | } |
228 | 228 | $repoId = Request::getInt('repo_id', 0); |
229 | 229 | $repoUser = Request::getString('repo_user', 'none'); |
@@ -236,14 +236,14 @@ discard block |
||
236 | 236 | // Breadcrumbs |
237 | 237 | $xoBreadcrumbs[] = ['title' => \_MA_WGGITHUB_INDEX]; |
238 | 238 | // Keywords |
239 | -wggithubMetaKeywords($helper->getConfig('keywords') . ', ' . \implode(',', $keywords)); |
|
239 | +wggithubMetaKeywords($helper->getConfig('keywords').', '.\implode(',', $keywords)); |
|
240 | 240 | unset($keywords); |
241 | 241 | // Description |
242 | 242 | wggithubMetaDescription(\_MA_WGGITHUB_INDEX_DESC); |
243 | 243 | $GLOBALS['xoopsTpl']->assign('xoops_mpageurl', WGGITHUB_URL.'/index.php'); |
244 | 244 | $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL); |
245 | 245 | $GLOBALS['xoopsTpl']->assign('wggithub_upload_url', WGGITHUB_UPLOAD_URL); |
246 | -require __DIR__ . '/footer.php'; |
|
246 | +require __DIR__.'/footer.php'; |
|
247 | 247 | |
248 | 248 | |
249 | 249 | |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | * |
253 | 253 | * @return bool |
254 | 254 | */ |
255 | -function executeUpdate(){ |
|
255 | +function executeUpdate() { |
|
256 | 256 | |
257 | 257 | $github = Github::getInstance(); |
258 | 258 | $helper = Helper::getInstance(); |
@@ -33,74 +33,74 @@ discard block |
||
33 | 33 | */ |
34 | 34 | class Directories extends \XoopsObject |
35 | 35 | { |
36 | - /** |
|
37 | - * Constructor |
|
38 | - * |
|
39 | - * @param null |
|
40 | - */ |
|
41 | - public function __construct() |
|
42 | - { |
|
43 | - $this->initVar('dir_id', \XOBJ_DTYPE_INT); |
|
44 | - $this->initVar('dir_name', \XOBJ_DTYPE_TXTBOX); |
|
45 | - $this->initVar('dir_type', \XOBJ_DTYPE_INT); |
|
36 | + /** |
|
37 | + * Constructor |
|
38 | + * |
|
39 | + * @param null |
|
40 | + */ |
|
41 | + public function __construct() |
|
42 | + { |
|
43 | + $this->initVar('dir_id', \XOBJ_DTYPE_INT); |
|
44 | + $this->initVar('dir_name', \XOBJ_DTYPE_TXTBOX); |
|
45 | + $this->initVar('dir_type', \XOBJ_DTYPE_INT); |
|
46 | 46 | $this->initVar('dir_autoupdate', XOBJ_DTYPE_INT); |
47 | 47 | $this->initVar('dir_online', XOBJ_DTYPE_INT); |
48 | 48 | $this->initVar('dir_filterrelease', XOBJ_DTYPE_INT); |
49 | - $this->initVar('dir_datecreated', \XOBJ_DTYPE_INT); |
|
50 | - $this->initVar('dir_submitter', \XOBJ_DTYPE_INT); |
|
51 | - } |
|
49 | + $this->initVar('dir_datecreated', \XOBJ_DTYPE_INT); |
|
50 | + $this->initVar('dir_submitter', \XOBJ_DTYPE_INT); |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * @static function &getInstance |
|
55 | - * |
|
56 | - * @param null |
|
57 | - */ |
|
58 | - public static function getInstance() |
|
59 | - { |
|
60 | - static $instance = false; |
|
61 | - if (!$instance) { |
|
62 | - $instance = new self(); |
|
63 | - } |
|
64 | - } |
|
53 | + /** |
|
54 | + * @static function &getInstance |
|
55 | + * |
|
56 | + * @param null |
|
57 | + */ |
|
58 | + public static function getInstance() |
|
59 | + { |
|
60 | + static $instance = false; |
|
61 | + if (!$instance) { |
|
62 | + $instance = new self(); |
|
63 | + } |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * The new inserted $Id |
|
68 | - * @return inserted id |
|
69 | - */ |
|
70 | - public function getNewInsertedIdDirectories() |
|
71 | - { |
|
72 | - $newInsertedId = $GLOBALS['xoopsDB']->getInsertId(); |
|
73 | - return $newInsertedId; |
|
74 | - } |
|
66 | + /** |
|
67 | + * The new inserted $Id |
|
68 | + * @return inserted id |
|
69 | + */ |
|
70 | + public function getNewInsertedIdDirectories() |
|
71 | + { |
|
72 | + $newInsertedId = $GLOBALS['xoopsDB']->getInsertId(); |
|
73 | + return $newInsertedId; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * @public function getForm |
|
78 | - * @param bool $action |
|
79 | - * @return \XoopsThemeForm |
|
80 | - */ |
|
81 | - public function getFormDirectories($action = false) |
|
82 | - { |
|
83 | - $helper = \XoopsModules\Wggithub\Helper::getInstance(); |
|
84 | - if (!$action) { |
|
85 | - $action = $_SERVER['REQUEST_URI']; |
|
86 | - } |
|
87 | - $isAdmin = $GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->mid()); |
|
76 | + /** |
|
77 | + * @public function getForm |
|
78 | + * @param bool $action |
|
79 | + * @return \XoopsThemeForm |
|
80 | + */ |
|
81 | + public function getFormDirectories($action = false) |
|
82 | + { |
|
83 | + $helper = \XoopsModules\Wggithub\Helper::getInstance(); |
|
84 | + if (!$action) { |
|
85 | + $action = $_SERVER['REQUEST_URI']; |
|
86 | + } |
|
87 | + $isAdmin = $GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->mid()); |
|
88 | 88 | |
89 | - // Title |
|
90 | - $title = $this->isNew() ? \sprintf(\_AM_WGGITHUB_DIRECTORY_ADD) : \sprintf(\_AM_WGGITHUB_DIRECTORY_EDIT); |
|
91 | - // Get Theme Form |
|
92 | - \xoops_load('XoopsFormLoader'); |
|
93 | - $form = new \XoopsThemeForm($title, 'form', $action, 'post', true); |
|
94 | - $form->setExtra('enctype="multipart/form-data"'); |
|
95 | - // Form Text dirName |
|
96 | - $form->addElement(new \XoopsFormText(\_AM_WGGITHUB_DIRECTORY_NAME, 'dir_name', 50, 255, $this->getVar('dir_name')), true); |
|
97 | - // Directories Handler |
|
98 | - $directoriesHandler = $helper->getHandler('Directories'); |
|
99 | - // Form Select dirType |
|
100 | - $dirTypeSelect = new \XoopsFormSelect(\_AM_WGGITHUB_DIRECTORY_TYPE, 'dir_type', $this->getVar('dir_type'), 5); |
|
101 | - $dirTypeSelect->addOption(Constants::DIRECTORY_TYPE_USER, \_AM_WGGITHUB_DIRECTORY_TYPE_USER); |
|
102 | - $dirTypeSelect->addOption(Constants::DIRECTORY_TYPE_ORG, \_AM_WGGITHUB_DIRECTORY_TYPE_ORG); |
|
103 | - $form->addElement($dirTypeSelect, true); |
|
89 | + // Title |
|
90 | + $title = $this->isNew() ? \sprintf(\_AM_WGGITHUB_DIRECTORY_ADD) : \sprintf(\_AM_WGGITHUB_DIRECTORY_EDIT); |
|
91 | + // Get Theme Form |
|
92 | + \xoops_load('XoopsFormLoader'); |
|
93 | + $form = new \XoopsThemeForm($title, 'form', $action, 'post', true); |
|
94 | + $form->setExtra('enctype="multipart/form-data"'); |
|
95 | + // Form Text dirName |
|
96 | + $form->addElement(new \XoopsFormText(\_AM_WGGITHUB_DIRECTORY_NAME, 'dir_name', 50, 255, $this->getVar('dir_name')), true); |
|
97 | + // Directories Handler |
|
98 | + $directoriesHandler = $helper->getHandler('Directories'); |
|
99 | + // Form Select dirType |
|
100 | + $dirTypeSelect = new \XoopsFormSelect(\_AM_WGGITHUB_DIRECTORY_TYPE, 'dir_type', $this->getVar('dir_type'), 5); |
|
101 | + $dirTypeSelect->addOption(Constants::DIRECTORY_TYPE_USER, \_AM_WGGITHUB_DIRECTORY_TYPE_USER); |
|
102 | + $dirTypeSelect->addOption(Constants::DIRECTORY_TYPE_ORG, \_AM_WGGITHUB_DIRECTORY_TYPE_ORG); |
|
103 | + $form->addElement($dirTypeSelect, true); |
|
104 | 104 | // Form Radio Yes/No dirAutoupdate |
105 | 105 | $dirAutoupdate = $this->isNew() ?: $this->getVar('dir_autoupdate'); |
106 | 106 | $form->addElement(new \XoopsFormRadioYN(_AM_WGGITHUB_DIRECTORY_AUTOUPDATE, 'dir_autoupdate', $dirAutoupdate)); |
@@ -110,51 +110,51 @@ discard block |
||
110 | 110 | // Form Radio Yes/No dirFilterrelease |
111 | 111 | $dirFilterrelease = $this->isNew() ?: $this->getVar('dir_filterrelease'); |
112 | 112 | $form->addElement(new \XoopsFormRadioYN(_AM_WGGITHUB_DIRECTORY_FILTERRELEASE, 'dir_filterrelease', $dirFilterrelease)); |
113 | - // Form Text Date Select dirDatecreated |
|
114 | - $dirDatecreated = $this->isNew() ?: $this->getVar('dir_datecreated'); |
|
115 | - $form->addElement(new \XoopsFormTextDateSelect(\_AM_WGGITHUB_DIRECTORY_DATECREATED, 'dir_datecreated', '', $dirDatecreated)); |
|
116 | - // Form Select User dirSubmitter |
|
117 | - $form->addElement(new \XoopsFormSelectUser(\_AM_WGGITHUB_DIRECTORY_SUBMITTER, 'dir_submitter', false, $this->getVar('dir_submitter'))); |
|
118 | - // To Save |
|
119 | - $form->addElement(new \XoopsFormHidden('op', 'save')); |
|
120 | - $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false)); |
|
121 | - return $form; |
|
122 | - } |
|
113 | + // Form Text Date Select dirDatecreated |
|
114 | + $dirDatecreated = $this->isNew() ?: $this->getVar('dir_datecreated'); |
|
115 | + $form->addElement(new \XoopsFormTextDateSelect(\_AM_WGGITHUB_DIRECTORY_DATECREATED, 'dir_datecreated', '', $dirDatecreated)); |
|
116 | + // Form Select User dirSubmitter |
|
117 | + $form->addElement(new \XoopsFormSelectUser(\_AM_WGGITHUB_DIRECTORY_SUBMITTER, 'dir_submitter', false, $this->getVar('dir_submitter'))); |
|
118 | + // To Save |
|
119 | + $form->addElement(new \XoopsFormHidden('op', 'save')); |
|
120 | + $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false)); |
|
121 | + return $form; |
|
122 | + } |
|
123 | 123 | |
124 | - /** |
|
125 | - * Get Values |
|
126 | - * @param null $keys |
|
127 | - * @param null $format |
|
128 | - * @param null $maxDepth |
|
129 | - * @return array |
|
130 | - */ |
|
131 | - public function getValuesDirectories($keys = null, $format = null, $maxDepth = null) |
|
132 | - { |
|
133 | - $ret = $this->getValues($keys, $format, $maxDepth); |
|
134 | - $ret['id'] = $this->getVar('dir_id'); |
|
135 | - $ret['name'] = $this->getVar('dir_name'); |
|
136 | - $ret['type'] = $this->getVar('dir_type'); |
|
124 | + /** |
|
125 | + * Get Values |
|
126 | + * @param null $keys |
|
127 | + * @param null $format |
|
128 | + * @param null $maxDepth |
|
129 | + * @return array |
|
130 | + */ |
|
131 | + public function getValuesDirectories($keys = null, $format = null, $maxDepth = null) |
|
132 | + { |
|
133 | + $ret = $this->getValues($keys, $format, $maxDepth); |
|
134 | + $ret['id'] = $this->getVar('dir_id'); |
|
135 | + $ret['name'] = $this->getVar('dir_name'); |
|
136 | + $ret['type'] = $this->getVar('dir_type'); |
|
137 | 137 | $ret['type_text'] = Constants::DIRECTORY_TYPE_USER == $this->getVar('dir_type') ? \_AM_WGGITHUB_DIRECTORY_TYPE_USER : \_AM_WGGITHUB_DIRECTORY_TYPE_ORG; |
138 | 138 | $ret['autoupdate'] = (int)$this->getVar('dir_autoupdate') > 0 ? _YES : _NO; |
139 | 139 | $ret['online'] = (int)$this->getVar('dir_online') > 0 ? _YES : _NO; |
140 | 140 | $ret['filterrelease'] = (int)$this->getVar('dir_filterrelease') > 0 ? _YES : _NO; |
141 | - $ret['datecreated'] = \formatTimestamp($this->getVar('dir_datecreated'), 's'); |
|
142 | - $ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('dir_submitter')); |
|
143 | - return $ret; |
|
144 | - } |
|
141 | + $ret['datecreated'] = \formatTimestamp($this->getVar('dir_datecreated'), 's'); |
|
142 | + $ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('dir_submitter')); |
|
143 | + return $ret; |
|
144 | + } |
|
145 | 145 | |
146 | - /** |
|
147 | - * Returns an array representation of the object |
|
148 | - * |
|
149 | - * @return array |
|
150 | - */ |
|
151 | - public function toArrayDirectories() |
|
152 | - { |
|
153 | - $ret = []; |
|
154 | - $vars = $this->getVars(); |
|
155 | - foreach (\array_keys($vars) as $var) { |
|
156 | - $ret[$var] = $this->getVar('"{$var}"'); |
|
157 | - } |
|
158 | - return $ret; |
|
159 | - } |
|
146 | + /** |
|
147 | + * Returns an array representation of the object |
|
148 | + * |
|
149 | + * @return array |
|
150 | + */ |
|
151 | + public function toArrayDirectories() |
|
152 | + { |
|
153 | + $ret = []; |
|
154 | + $vars = $this->getVars(); |
|
155 | + foreach (\array_keys($vars) as $var) { |
|
156 | + $ret[$var] = $this->getVar('"{$var}"'); |
|
157 | + } |
|
158 | + return $ret; |
|
159 | + } |
|
160 | 160 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | interface Constants |
30 | 30 | { |
31 | - // Constants for tables |
|
31 | + // Constants for tables |
|
32 | 32 | public const TABLE_SETTINGS = 0; |
33 | 33 | public const TABLE_REPOSITORIES = 1; |
34 | 34 | public const TABLE_DIRECTORIES = 2; |
@@ -39,16 +39,16 @@ discard block |
||
39 | 39 | public const DIRECTORY_TYPE_USER = 1; |
40 | 40 | public const DIRECTORY_TYPE_ORG = 2; |
41 | 41 | |
42 | - // Constants for status |
|
43 | - public const STATUS_NONE = 0; |
|
42 | + // Constants for status |
|
43 | + public const STATUS_NONE = 0; |
|
44 | 44 | public const STATUS_NEW = 1; |
45 | 45 | public const STATUS_UPDATED = 2; |
46 | - public const STATUS_UPTODATE = 3; |
|
46 | + public const STATUS_UPTODATE = 3; |
|
47 | 47 | |
48 | - // Constants for permissions |
|
49 | - public const PERM_GLOBAL_NONE = 0; |
|
50 | - public const PERM_GLOBAL_VIEW = 1; |
|
51 | - public const PERM_GLOBAL_READ = 2; |
|
52 | - public const PERM_README_UPDATE = 3; |
|
48 | + // Constants for permissions |
|
49 | + public const PERM_GLOBAL_NONE = 0; |
|
50 | + public const PERM_GLOBAL_VIEW = 1; |
|
51 | + public const PERM_GLOBAL_READ = 2; |
|
52 | + public const PERM_README_UPDATE = 3; |
|
53 | 53 | |
54 | 54 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | |
210 | 210 | if (isset($CurrentBlock['continuable'])) |
211 | 211 | { |
212 | - $methodName = 'block' . $CurrentBlock['type'] . 'Continue'; |
|
212 | + $methodName = 'block'.$CurrentBlock['type'].'Continue'; |
|
213 | 213 | $Block = $this->$methodName($Line, $CurrentBlock); |
214 | 214 | |
215 | 215 | if (isset($Block)) |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | } else { |
221 | 221 | if ($this->isBlockCompletable($CurrentBlock['type'])) |
222 | 222 | { |
223 | - $methodName = 'block' . $CurrentBlock['type'] . 'Complete'; |
|
223 | + $methodName = 'block'.$CurrentBlock['type'].'Complete'; |
|
224 | 224 | $CurrentBlock = $this->$methodName($CurrentBlock); |
225 | 225 | } |
226 | 226 | } |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | { |
239 | 239 | foreach ($this->BlockTypes[$marker] as $blockType) |
240 | 240 | { |
241 | - $blockTypes []= $blockType; |
|
241 | + $blockTypes [] = $blockType; |
|
242 | 242 | } |
243 | 243 | } |
244 | 244 | |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | { |
254 | 254 | $Block['type'] = $blockType; |
255 | 255 | |
256 | - if ( ! isset($Block['identified'])) |
|
256 | + if (!isset($Block['identified'])) |
|
257 | 257 | { |
258 | 258 | if (isset($CurrentBlock)) |
259 | 259 | { |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | |
301 | 301 | if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type'])) |
302 | 302 | { |
303 | - $methodName = 'block' . $CurrentBlock['type'] . 'Complete'; |
|
303 | + $methodName = 'block'.$CurrentBlock['type'].'Complete'; |
|
304 | 304 | $CurrentBlock = $this->$methodName($CurrentBlock); |
305 | 305 | } |
306 | 306 | |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | |
319 | 319 | protected function extractElement(array $Component) |
320 | 320 | { |
321 | - if ( ! isset($Component['element'])) |
|
321 | + if (!isset($Component['element'])) |
|
322 | 322 | { |
323 | 323 | if (isset($Component['markup'])) |
324 | 324 | { |
@@ -333,12 +333,12 @@ discard block |
||
333 | 333 | |
334 | 334 | protected function isBlockContinuable($Type) |
335 | 335 | { |
336 | - return method_exists($this, 'block' . $Type . 'Continue'); |
|
336 | + return method_exists($this, 'block'.$Type.'Continue'); |
|
337 | 337 | } |
338 | 338 | |
339 | 339 | protected function isBlockCompletable($Type) |
340 | 340 | { |
341 | - return method_exists($this, 'block' . $Type . 'Complete'); |
|
341 | + return method_exists($this, 'block'.$Type.'Complete'); |
|
342 | 342 | } |
343 | 343 | |
344 | 344 | # |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | |
347 | 347 | protected function blockCode($Line, $Block = null) |
348 | 348 | { |
349 | - if (isset($Block) and $Block['type'] === 'Paragraph' and ! isset($Block['interrupted'])) |
|
349 | + if (isset($Block) and $Block['type'] === 'Paragraph' and !isset($Block['interrupted'])) |
|
350 | 350 | { |
351 | 351 | return; |
352 | 352 | } |
@@ -430,7 +430,7 @@ discard block |
||
430 | 430 | return; |
431 | 431 | } |
432 | 432 | |
433 | - $Block['element']['rawHtml'] .= "\n" . $Line['body']; |
|
433 | + $Block['element']['rawHtml'] .= "\n".$Line['body']; |
|
434 | 434 | |
435 | 435 | if (strpos($Line['text'], '-->') !== false) |
436 | 436 | { |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | return $Block; |
522 | 522 | } |
523 | 523 | |
524 | - $Block['element']['element']['text'] .= "\n" . $Line['body']; |
|
524 | + $Block['element']['element']['text'] .= "\n".$Line['body']; |
|
525 | 525 | |
526 | 526 | return $Block; |
527 | 527 | } |
@@ -554,7 +554,7 @@ discard block |
||
554 | 554 | |
555 | 555 | $Block = array( |
556 | 556 | 'element' => array( |
557 | - 'name' => 'h' . $level, |
|
557 | + 'name' => 'h'.$level, |
|
558 | 558 | 'handler' => array( |
559 | 559 | 'function' => 'lineElements', |
560 | 560 | 'argument' => $text, |
@@ -581,7 +581,7 @@ discard block |
||
581 | 581 | { |
582 | 582 | $contentIndent -= 1; |
583 | 583 | $matches[1] = substr($matches[1], 0, -$contentIndent); |
584 | - $matches[3] = str_repeat(' ', $contentIndent) . $matches[3]; |
|
584 | + $matches[3] = str_repeat(' ', $contentIndent).$matches[3]; |
|
585 | 585 | } elseif ($contentIndent === 0) { |
586 | 586 | $matches[1] .= ' '; |
587 | 587 | } |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | if ( |
613 | 613 | isset($CurrentBlock) |
614 | 614 | and $CurrentBlock['type'] === 'Paragraph' |
615 | - and ! isset($CurrentBlock['interrupted']) |
|
615 | + and !isset($CurrentBlock['interrupted']) |
|
616 | 616 | ) { |
617 | 617 | return; |
618 | 618 | } |
@@ -630,7 +630,7 @@ discard block |
||
630 | 630 | ) |
631 | 631 | ); |
632 | 632 | |
633 | - $Block['element']['elements'] []= & $Block['li']; |
|
633 | + $Block['element']['elements'] [] = & $Block['li']; |
|
634 | 634 | |
635 | 635 | return $Block; |
636 | 636 | } |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | ) |
658 | 658 | ) { |
659 | 659 | if (isset($Block['interrupted'])) { |
660 | - $Block['li']['handler']['argument'] []= ''; |
|
660 | + $Block['li']['handler']['argument'] [] = ''; |
|
661 | 661 | |
662 | 662 | $Block['loose'] = true; |
663 | 663 | |
@@ -679,7 +679,7 @@ discard block |
||
679 | 679 | ) |
680 | 680 | ); |
681 | 681 | |
682 | - $Block['element']['elements'] []= & $Block['li']; |
|
682 | + $Block['element']['elements'] [] = & $Block['li']; |
|
683 | 683 | |
684 | 684 | return $Block; |
685 | 685 | } elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line)) { |
@@ -693,7 +693,7 @@ discard block |
||
693 | 693 | if ($Line['indent'] >= $requiredIndent) { |
694 | 694 | if (isset($Block['interrupted'])) |
695 | 695 | { |
696 | - $Block['li']['handler']['argument'] []= ''; |
|
696 | + $Block['li']['handler']['argument'] [] = ''; |
|
697 | 697 | |
698 | 698 | $Block['loose'] = true; |
699 | 699 | |
@@ -702,15 +702,15 @@ discard block |
||
702 | 702 | |
703 | 703 | $text = substr($Line['body'], $requiredIndent); |
704 | 704 | |
705 | - $Block['li']['handler']['argument'] []= $text; |
|
705 | + $Block['li']['handler']['argument'] [] = $text; |
|
706 | 706 | |
707 | 707 | return $Block; |
708 | 708 | } |
709 | 709 | |
710 | - if ( ! isset($Block['interrupted'])) { |
|
710 | + if (!isset($Block['interrupted'])) { |
|
711 | 711 | $text = preg_replace('/^[ ]{0,'.$requiredIndent.'}+/', '', $Line['body']); |
712 | 712 | |
713 | - $Block['li']['handler']['argument'] []= $text; |
|
713 | + $Block['li']['handler']['argument'] [] = $text; |
|
714 | 714 | |
715 | 715 | return $Block; |
716 | 716 | } |
@@ -723,7 +723,7 @@ discard block |
||
723 | 723 | { |
724 | 724 | if (end($li['handler']['argument']) !== '') |
725 | 725 | { |
726 | - $li['handler']['argument'] []= ''; |
|
726 | + $li['handler']['argument'] [] = ''; |
|
727 | 727 | } |
728 | 728 | } |
729 | 729 | } |
@@ -759,13 +759,13 @@ discard block |
||
759 | 759 | } |
760 | 760 | |
761 | 761 | if ($Line['text'][0] === '>' and preg_match('/^>[ ]?+(.*+)/', $Line['text'], $matches)) { |
762 | - $Block['element']['handler']['argument'] []= $matches[1]; |
|
762 | + $Block['element']['handler']['argument'] [] = $matches[1]; |
|
763 | 763 | |
764 | 764 | return $Block; |
765 | 765 | } |
766 | 766 | |
767 | - if ( ! isset($Block['interrupted'])) { |
|
768 | - $Block['element']['handler']['argument'] []= $Line['text']; |
|
767 | + if (!isset($Block['interrupted'])) { |
|
768 | + $Block['element']['handler']['argument'] [] = $Line['text']; |
|
769 | 769 | |
770 | 770 | return $Block; |
771 | 771 | } |
@@ -794,7 +794,7 @@ discard block |
||
794 | 794 | |
795 | 795 | protected function blockSetextHeader($Line, array $Block = null) |
796 | 796 | { |
797 | - if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted'])) { |
|
797 | + if (!isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted'])) { |
|
798 | 798 | return; |
799 | 799 | } |
800 | 800 | |
@@ -839,7 +839,7 @@ discard block |
||
839 | 839 | return; |
840 | 840 | } |
841 | 841 | |
842 | - $Block['element']['rawHtml'] .= "\n" . $Line['body']; |
|
842 | + $Block['element']['rawHtml'] .= "\n".$Line['body']; |
|
843 | 843 | |
844 | 844 | return $Block; |
845 | 845 | } |
@@ -874,7 +874,7 @@ discard block |
||
874 | 874 | |
875 | 875 | protected function blockTable($Line, array $Block = null) |
876 | 876 | { |
877 | - if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted'])) { |
|
877 | + if (!isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted'])) { |
|
878 | 878 | return; |
879 | 879 | } |
880 | 880 | |
@@ -917,7 +917,7 @@ discard block |
||
917 | 917 | $alignment = $alignment === 'left' ? 'center' : 'right'; |
918 | 918 | } |
919 | 919 | |
920 | - $alignments []= $alignment; |
|
920 | + $alignments [] = $alignment; |
|
921 | 921 | } |
922 | 922 | |
923 | 923 | # ~ |
@@ -955,7 +955,7 @@ discard block |
||
955 | 955 | ); |
956 | 956 | } |
957 | 957 | |
958 | - $HeaderElements []= $HeaderElement; |
|
958 | + $HeaderElements [] = $HeaderElement; |
|
959 | 959 | } |
960 | 960 | |
961 | 961 | # ~ |
@@ -969,16 +969,16 @@ discard block |
||
969 | 969 | ), |
970 | 970 | ); |
971 | 971 | |
972 | - $Block['element']['elements'] []= array( |
|
972 | + $Block['element']['elements'] [] = array( |
|
973 | 973 | 'name' => 'thead', |
974 | 974 | ); |
975 | 975 | |
976 | - $Block['element']['elements'] []= array( |
|
976 | + $Block['element']['elements'] [] = array( |
|
977 | 977 | 'name' => 'tbody', |
978 | 978 | 'elements' => array(), |
979 | 979 | ); |
980 | 980 | |
981 | - $Block['element']['elements'][0]['elements'] []= array( |
|
981 | + $Block['element']['elements'][0]['elements'] [] = array( |
|
982 | 982 | 'name' => 'tr', |
983 | 983 | 'elements' => $HeaderElements, |
984 | 984 | ); |
@@ -1021,11 +1021,11 @@ discard block |
||
1021 | 1021 | if (isset($Block['alignments'][$index])) |
1022 | 1022 | { |
1023 | 1023 | $Element['attributes'] = array( |
1024 | - 'style' => 'text-align: ' . $Block['alignments'][$index] . ';', |
|
1024 | + 'style' => 'text-align: '.$Block['alignments'][$index].';', |
|
1025 | 1025 | ); |
1026 | 1026 | } |
1027 | 1027 | |
1028 | - $Elements []= $Element; |
|
1028 | + $Elements [] = $Element; |
|
1029 | 1029 | } |
1030 | 1030 | |
1031 | 1031 | $Element = array( |
@@ -1033,7 +1033,7 @@ discard block |
||
1033 | 1033 | 'elements' => $Elements, |
1034 | 1034 | ); |
1035 | 1035 | |
1036 | - $Block['element']['elements'][1]['elements'] []= $Element; |
|
1036 | + $Block['element']['elements'][1]['elements'] [] = $Element; |
|
1037 | 1037 | |
1038 | 1038 | return $Block; |
1039 | 1039 | } |
@@ -1133,7 +1133,7 @@ discard block |
||
1133 | 1133 | |
1134 | 1134 | $Inline = $this->{"inline$inlineType"}($Excerpt); |
1135 | 1135 | |
1136 | - if ( ! isset($Inline)) |
|
1136 | + if (!isset($Inline)) |
|
1137 | 1137 | { |
1138 | 1138 | continue; |
1139 | 1139 | } |
@@ -1147,7 +1147,7 @@ discard block |
||
1147 | 1147 | |
1148 | 1148 | # sets a default inline position |
1149 | 1149 | |
1150 | - if ( ! isset($Inline['position'])) |
|
1150 | + if (!isset($Inline['position'])) |
|
1151 | 1151 | { |
1152 | 1152 | $Inline['position'] = $markerPosition; |
1153 | 1153 | } |
@@ -1191,7 +1191,7 @@ discard block |
||
1191 | 1191 | |
1192 | 1192 | foreach ($Elements as &$Element) |
1193 | 1193 | { |
1194 | - if ( ! isset($Element['autobreak'])) |
|
1194 | + if (!isset($Element['autobreak'])) |
|
1195 | 1195 | { |
1196 | 1196 | $Element['autobreak'] = false; |
1197 | 1197 | } |
@@ -1247,14 +1247,14 @@ discard block |
||
1247 | 1247 | $hostnameLabel = '[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?'; |
1248 | 1248 | |
1249 | 1249 | $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]++@' |
1250 | - . $hostnameLabel . '(?:\.' . $hostnameLabel . ')*'; |
|
1250 | + . $hostnameLabel.'(?:\.'.$hostnameLabel.')*'; |
|
1251 | 1251 | |
1252 | 1252 | if (strpos($Excerpt['text'], '>') !== false |
1253 | 1253 | and preg_match("/^<((mailto:)?$commonMarkEmail)>/i", $Excerpt['text'], $matches) |
1254 | - ){ |
|
1254 | + ) { |
|
1255 | 1255 | $url = $matches[1]; |
1256 | 1256 | |
1257 | - if ( ! isset($matches[2])) |
|
1257 | + if (!isset($matches[2])) |
|
1258 | 1258 | { |
1259 | 1259 | $url = "mailto:$url"; |
1260 | 1260 | } |
@@ -1274,7 +1274,7 @@ discard block |
||
1274 | 1274 | |
1275 | 1275 | protected function inlineEmphasis($Excerpt) |
1276 | 1276 | { |
1277 | - if ( ! isset($Excerpt['text'][1])) |
|
1277 | + if (!isset($Excerpt['text'][1])) |
|
1278 | 1278 | { |
1279 | 1279 | return; |
1280 | 1280 | } |
@@ -1320,12 +1320,12 @@ discard block |
||
1320 | 1320 | |
1321 | 1321 | protected function inlineImage($Excerpt) |
1322 | 1322 | { |
1323 | - if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[') |
|
1323 | + if (!isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[') |
|
1324 | 1324 | { |
1325 | 1325 | return; |
1326 | 1326 | } |
1327 | 1327 | |
1328 | - $Excerpt['text']= substr($Excerpt['text'], 1); |
|
1328 | + $Excerpt['text'] = substr($Excerpt['text'], 1); |
|
1329 | 1329 | |
1330 | 1330 | $Link = $this->inlineLink($Excerpt); |
1331 | 1331 | |
@@ -1411,7 +1411,7 @@ discard block |
||
1411 | 1411 | $definition = strtolower($Element['handler']['argument']); |
1412 | 1412 | } |
1413 | 1413 | |
1414 | - if ( ! isset($this->DefinitionData['Reference'][$definition])) |
|
1414 | + if (!isset($this->DefinitionData['Reference'][$definition])) |
|
1415 | 1415 | { |
1416 | 1416 | return; |
1417 | 1417 | } |
@@ -1466,7 +1466,7 @@ discard block |
||
1466 | 1466 | and preg_match('/^&(#?+[0-9a-zA-Z]++);/', $Excerpt['text'], $matches) |
1467 | 1467 | ) { |
1468 | 1468 | return array( |
1469 | - 'element' => array('rawHtml' => '&' . $matches[1] . ';'), |
|
1469 | + 'element' => array('rawHtml' => '&'.$matches[1].';'), |
|
1470 | 1470 | 'extent' => strlen($matches[0]), |
1471 | 1471 | ); |
1472 | 1472 | } |
@@ -1476,7 +1476,7 @@ discard block |
||
1476 | 1476 | |
1477 | 1477 | protected function inlineStrikethrough($Excerpt) |
1478 | 1478 | { |
1479 | - if ( ! isset($Excerpt['text'][1])) |
|
1479 | + if (!isset($Excerpt['text'][1])) |
|
1480 | 1480 | { |
1481 | 1481 | return; |
1482 | 1482 | } |
@@ -1499,7 +1499,7 @@ discard block |
||
1499 | 1499 | |
1500 | 1500 | protected function inlineUrl($Excerpt) |
1501 | 1501 | { |
1502 | - if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/') |
|
1502 | + if ($this->urlsLinked !== true or !isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/') |
|
1503 | 1503 | { |
1504 | 1504 | return; |
1505 | 1505 | } |
@@ -1670,7 +1670,7 @@ discard block |
||
1670 | 1670 | |
1671 | 1671 | if ($hasName) |
1672 | 1672 | { |
1673 | - $markup .= '<' . $Element['name']; |
|
1673 | + $markup .= '<'.$Element['name']; |
|
1674 | 1674 | |
1675 | 1675 | if (isset($Element['attributes'])) |
1676 | 1676 | { |
@@ -1728,7 +1728,7 @@ discard block |
||
1728 | 1728 | } |
1729 | 1729 | } |
1730 | 1730 | |
1731 | - $markup .= $hasName ? '</' . $Element['name'] . '>' : ''; |
|
1731 | + $markup .= $hasName ? '</'.$Element['name'].'>' : ''; |
|
1732 | 1732 | } |
1733 | 1733 | elseif ($hasName) |
1734 | 1734 | { |
@@ -1757,7 +1757,7 @@ discard block |
||
1757 | 1757 | // (autobreak === false) covers both sides of an element |
1758 | 1758 | $autoBreak = !$autoBreak ? $autoBreak : $autoBreakNext; |
1759 | 1759 | |
1760 | - $markup .= ($autoBreak ? "\n" : '') . $this->element($Element); |
|
1760 | + $markup .= ($autoBreak ? "\n" : '').$this->element($Element); |
|
1761 | 1761 | $autoBreak = $autoBreakNext; |
1762 | 1762 | } |
1763 | 1763 | |
@@ -1772,7 +1772,7 @@ discard block |
||
1772 | 1772 | { |
1773 | 1773 | $Elements = $this->linesElements($lines); |
1774 | 1774 | |
1775 | - if ( ! in_array('', $lines) |
|
1775 | + if (!in_array('', $lines) |
|
1776 | 1776 | and isset($Elements[0]) and isset($Elements[0]['name']) |
1777 | 1777 | and $Elements[0]['name'] === 'p' |
1778 | 1778 | ) { |
@@ -1829,12 +1829,12 @@ discard block |
||
1829 | 1829 | protected function sanitiseElement(array $Element) |
1830 | 1830 | { |
1831 | 1831 | static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/'; |
1832 | - static $safeUrlNameToAtt = array( |
|
1832 | + static $safeUrlNameToAtt = array( |
|
1833 | 1833 | 'a' => 'href', |
1834 | 1834 | 'img' => 'src', |
1835 | 1835 | ); |
1836 | 1836 | |
1837 | - if ( ! isset($Element['name'])) |
|
1837 | + if (!isset($Element['name'])) |
|
1838 | 1838 | { |
1839 | 1839 | unset($Element['attributes']); |
1840 | 1840 | return $Element; |
@@ -1845,12 +1845,12 @@ discard block |
||
1845 | 1845 | $Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]); |
1846 | 1846 | } |
1847 | 1847 | |
1848 | - if ( ! empty($Element['attributes'])) |
|
1848 | + if (!empty($Element['attributes'])) |
|
1849 | 1849 | { |
1850 | 1850 | foreach ($Element['attributes'] as $att => $val) |
1851 | 1851 | { |
1852 | 1852 | # filter out badly parsed attribute |
1853 | - if ( ! preg_match($goodAttribute, $att)) |
|
1853 | + if (!preg_match($goodAttribute, $att)) |
|
1854 | 1854 | { |
1855 | 1855 | unset($Element['attributes'][$att]); |
1856 | 1856 | } |
@@ -1951,8 +1951,8 @@ discard block |
||
1951 | 1951 | protected $textLevelElements = array( |
1952 | 1952 | 'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont', |
1953 | 1953 | 'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing', |
1954 | - 'i', 'rp', 'del', 'code', 'strike', 'marquee', |
|
1955 | - 'q', 'rt', 'ins', 'font', 'strong', |
|
1954 | + 'i', 'rp', 'del', 'code', 'strike', 'marquee', |
|
1955 | + 'q', 'rt', 'ins', 'font', 'strong', |
|
1956 | 1956 | 's', 'tt', 'kbd', 'mark', |
1957 | 1957 | 'u', 'xm', 'sub', 'nobr', |
1958 | 1958 | 'sup', 'ruby', |
@@ -1284,12 +1284,10 @@ discard block |
||
1284 | 1284 | if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches)) |
1285 | 1285 | { |
1286 | 1286 | $emphasis = 'strong'; |
1287 | - } |
|
1288 | - elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches)) |
|
1287 | + } elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches)) |
|
1289 | 1288 | { |
1290 | 1289 | $emphasis = 'em'; |
1291 | - } |
|
1292 | - else |
|
1290 | + } else |
|
1293 | 1291 | { |
1294 | 1292 | return; |
1295 | 1293 | } |
@@ -1380,8 +1378,7 @@ discard block |
||
1380 | 1378 | $extent += strlen($matches[0]); |
1381 | 1379 | |
1382 | 1380 | $remainder = substr($remainder, $extent); |
1383 | - } |
|
1384 | - else |
|
1381 | + } else |
|
1385 | 1382 | { |
1386 | 1383 | return; |
1387 | 1384 | } |
@@ -1396,8 +1393,7 @@ discard block |
||
1396 | 1393 | } |
1397 | 1394 | |
1398 | 1395 | $extent += strlen($matches[0]); |
1399 | - } |
|
1400 | - else |
|
1396 | + } else |
|
1401 | 1397 | { |
1402 | 1398 | if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches)) |
1403 | 1399 | { |
@@ -1405,8 +1401,7 @@ discard block |
||
1405 | 1401 | $definition = strtolower($definition); |
1406 | 1402 | |
1407 | 1403 | $extent += strlen($matches[0]); |
1408 | - } |
|
1409 | - else |
|
1404 | + } else |
|
1410 | 1405 | { |
1411 | 1406 | $definition = strtolower($Element['handler']['argument']); |
1412 | 1407 | } |
@@ -1571,8 +1566,7 @@ discard block |
||
1571 | 1566 | $argument = $Element['text']; |
1572 | 1567 | unset($Element['text']); |
1573 | 1568 | $destination = 'rawHtml'; |
1574 | - } |
|
1575 | - else |
|
1569 | + } else |
|
1576 | 1570 | { |
1577 | 1571 | $function = $Element['handler']['function']; |
1578 | 1572 | $argument = $Element['handler']['argument']; |
@@ -1609,8 +1603,7 @@ discard block |
||
1609 | 1603 | if (isset($Element['elements'])) |
1610 | 1604 | { |
1611 | 1605 | $Element['elements'] = $this->elementsApplyRecursive($closure, $Element['elements']); |
1612 | - } |
|
1613 | - elseif (isset($Element['element'])) |
|
1606 | + } elseif (isset($Element['element'])) |
|
1614 | 1607 | { |
1615 | 1608 | $Element['element'] = $this->elementApplyRecursive($closure, $Element['element']); |
1616 | 1609 | } |
@@ -1623,8 +1616,7 @@ discard block |
||
1623 | 1616 | if (isset($Element['elements'])) |
1624 | 1617 | { |
1625 | 1618 | $Element['elements'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['elements']); |
1626 | - } |
|
1627 | - elseif (isset($Element['element'])) |
|
1619 | + } elseif (isset($Element['element'])) |
|
1628 | 1620 | { |
1629 | 1621 | $Element['element'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['element']); |
1630 | 1622 | } |
@@ -1711,26 +1703,22 @@ discard block |
||
1711 | 1703 | if (isset($Element['elements'])) |
1712 | 1704 | { |
1713 | 1705 | $markup .= $this->elements($Element['elements']); |
1714 | - } |
|
1715 | - elseif (isset($Element['element'])) |
|
1706 | + } elseif (isset($Element['element'])) |
|
1716 | 1707 | { |
1717 | 1708 | $markup .= $this->element($Element['element']); |
1718 | - } |
|
1719 | - else |
|
1709 | + } else |
|
1720 | 1710 | { |
1721 | 1711 | if (!$permitRawHtml) |
1722 | 1712 | { |
1723 | 1713 | $markup .= self::escape($text, true); |
1724 | - } |
|
1725 | - else |
|
1714 | + } else |
|
1726 | 1715 | { |
1727 | 1716 | $markup .= $text; |
1728 | 1717 | } |
1729 | 1718 | } |
1730 | 1719 | |
1731 | 1720 | $markup .= $hasName ? '</' . $Element['name'] . '>' : ''; |
1732 | - } |
|
1733 | - elseif ($hasName) |
|
1721 | + } elseif ($hasName) |
|
1734 | 1722 | { |
1735 | 1723 | $markup .= ' />'; |
1736 | 1724 | } |
@@ -1896,8 +1884,7 @@ discard block |
||
1896 | 1884 | if ($len > strlen($string)) |
1897 | 1885 | { |
1898 | 1886 | return false; |
1899 | - } |
|
1900 | - else |
|
1887 | + } else |
|
1901 | 1888 | { |
1902 | 1889 | return strtolower(substr($string, 0, $len)) === strtolower($needle); |
1903 | 1890 | } |
@@ -35,96 +35,96 @@ |
||
35 | 35 | */ |
36 | 36 | class ReadmesHandler extends \XoopsPersistableObjectHandler |
37 | 37 | { |
38 | - /** |
|
39 | - * Constructor |
|
40 | - * |
|
41 | - * @param \XoopsDatabase $db |
|
42 | - */ |
|
43 | - public function __construct(\XoopsDatabase $db) |
|
44 | - { |
|
45 | - parent::__construct($db, 'wggithub_readmes', Readmes::class, 'rm_id', 'rm_name'); |
|
46 | - } |
|
38 | + /** |
|
39 | + * Constructor |
|
40 | + * |
|
41 | + * @param \XoopsDatabase $db |
|
42 | + */ |
|
43 | + public function __construct(\XoopsDatabase $db) |
|
44 | + { |
|
45 | + parent::__construct($db, 'wggithub_readmes', Readmes::class, 'rm_id', 'rm_name'); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @param bool $isNew |
|
50 | - * |
|
51 | - * @return object |
|
52 | - */ |
|
53 | - public function create($isNew = true) |
|
54 | - { |
|
55 | - return parent::create($isNew); |
|
56 | - } |
|
48 | + /** |
|
49 | + * @param bool $isNew |
|
50 | + * |
|
51 | + * @return object |
|
52 | + */ |
|
53 | + public function create($isNew = true) |
|
54 | + { |
|
55 | + return parent::create($isNew); |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * retrieve a field |
|
60 | - * |
|
61 | - * @param int $i field id |
|
62 | - * @param null fields |
|
63 | - * @return mixed reference to the {@link Get} object |
|
64 | - */ |
|
65 | - public function get($i = null, $fields = null) |
|
66 | - { |
|
67 | - return parent::get($i, $fields); |
|
68 | - } |
|
58 | + /** |
|
59 | + * retrieve a field |
|
60 | + * |
|
61 | + * @param int $i field id |
|
62 | + * @param null fields |
|
63 | + * @return mixed reference to the {@link Get} object |
|
64 | + */ |
|
65 | + public function get($i = null, $fields = null) |
|
66 | + { |
|
67 | + return parent::get($i, $fields); |
|
68 | + } |
|
69 | 69 | |
70 | - /** |
|
71 | - * get inserted id |
|
72 | - * |
|
73 | - * @param null |
|
74 | - * @return int reference to the {@link Get} object |
|
75 | - */ |
|
76 | - public function getInsertId() |
|
77 | - { |
|
78 | - return $this->db->getInsertId(); |
|
79 | - } |
|
70 | + /** |
|
71 | + * get inserted id |
|
72 | + * |
|
73 | + * @param null |
|
74 | + * @return int reference to the {@link Get} object |
|
75 | + */ |
|
76 | + public function getInsertId() |
|
77 | + { |
|
78 | + return $this->db->getInsertId(); |
|
79 | + } |
|
80 | 80 | |
81 | - /** |
|
82 | - * Get Count Readmes in the database |
|
83 | - * @param int $start |
|
84 | - * @param int $limit |
|
85 | - * @param string $sort |
|
86 | - * @param string $order |
|
87 | - * @return int |
|
88 | - */ |
|
89 | - public function getCountReadmes($start = 0, $limit = 0, $sort = 'rm_id ASC, rm_name', $order = 'ASC') |
|
90 | - { |
|
91 | - $crCountReadmes = new \CriteriaCompo(); |
|
92 | - $crCountReadmes = $this->getReadmesCriteria($crCountReadmes, $start, $limit, $sort, $order); |
|
93 | - return $this->getCount($crCountReadmes); |
|
94 | - } |
|
81 | + /** |
|
82 | + * Get Count Readmes in the database |
|
83 | + * @param int $start |
|
84 | + * @param int $limit |
|
85 | + * @param string $sort |
|
86 | + * @param string $order |
|
87 | + * @return int |
|
88 | + */ |
|
89 | + public function getCountReadmes($start = 0, $limit = 0, $sort = 'rm_id ASC, rm_name', $order = 'ASC') |
|
90 | + { |
|
91 | + $crCountReadmes = new \CriteriaCompo(); |
|
92 | + $crCountReadmes = $this->getReadmesCriteria($crCountReadmes, $start, $limit, $sort, $order); |
|
93 | + return $this->getCount($crCountReadmes); |
|
94 | + } |
|
95 | 95 | |
96 | - /** |
|
97 | - * Get All Readmes in the database |
|
98 | - * @param int $start |
|
99 | - * @param int $limit |
|
100 | - * @param string $sort |
|
101 | - * @param string $order |
|
102 | - * @return array |
|
103 | - */ |
|
104 | - public function getAllReadmes($start = 0, $limit = 0, $sort = 'rm_id ASC, rm_name', $order = 'ASC') |
|
105 | - { |
|
106 | - $crAllReadmes = new \CriteriaCompo(); |
|
107 | - $crAllReadmes = $this->getReadmesCriteria($crAllReadmes, $start, $limit, $sort, $order); |
|
108 | - return $this->getAll($crAllReadmes); |
|
109 | - } |
|
96 | + /** |
|
97 | + * Get All Readmes in the database |
|
98 | + * @param int $start |
|
99 | + * @param int $limit |
|
100 | + * @param string $sort |
|
101 | + * @param string $order |
|
102 | + * @return array |
|
103 | + */ |
|
104 | + public function getAllReadmes($start = 0, $limit = 0, $sort = 'rm_id ASC, rm_name', $order = 'ASC') |
|
105 | + { |
|
106 | + $crAllReadmes = new \CriteriaCompo(); |
|
107 | + $crAllReadmes = $this->getReadmesCriteria($crAllReadmes, $start, $limit, $sort, $order); |
|
108 | + return $this->getAll($crAllReadmes); |
|
109 | + } |
|
110 | 110 | |
111 | - /** |
|
112 | - * Get Criteria Readmes |
|
113 | - * @param $crReadmes |
|
114 | - * @param int $start |
|
115 | - * @param int $limit |
|
116 | - * @param string $sort |
|
117 | - * @param string $order |
|
118 | - * @return int |
|
119 | - */ |
|
120 | - private function getReadmesCriteria($crReadmes, $start, $limit, $sort, $order) |
|
121 | - { |
|
122 | - $crReadmes->setStart($start); |
|
123 | - $crReadmes->setLimit($limit); |
|
124 | - $crReadmes->setSort($sort); |
|
125 | - $crReadmes->setOrder($order); |
|
126 | - return $crReadmes; |
|
127 | - } |
|
111 | + /** |
|
112 | + * Get Criteria Readmes |
|
113 | + * @param $crReadmes |
|
114 | + * @param int $start |
|
115 | + * @param int $limit |
|
116 | + * @param string $sort |
|
117 | + * @param string $order |
|
118 | + * @return int |
|
119 | + */ |
|
120 | + private function getReadmesCriteria($crReadmes, $start, $limit, $sort, $order) |
|
121 | + { |
|
122 | + $crReadmes->setStart($start); |
|
123 | + $crReadmes->setLimit($limit); |
|
124 | + $crReadmes->setSort($sort); |
|
125 | + $crReadmes->setOrder($order); |
|
126 | + return $crReadmes; |
|
127 | + } |
|
128 | 128 | |
129 | 129 | /** |
130 | 130 | * Update table requests |