Merge pull request #16 from ggoffy/master

- replacement of relative paths for gitbook
XoopsModules25x · Jan 7, 2021 · 01dbece · 01dbece
2 parents 3baaac6 + 09b3f40
commit 01dbece
Show file tree

Hide file tree

Showing 23 changed files with 21,877 additions and 17,937 deletions.
diff --git a/_TODO.txt b/_TODO.txt
@@ -1 +1,5 @@
+XoopsDocs: 
+- Images not shown
+- add link to gitbook to open
+
 
diff --git a/admin/readmes.php b/admin/readmes.php
@@ -92,6 +92,7 @@
         $readmesObj->setVar('rm_content', Request::getString('rm_content', ''));
         $readmesObj->setVar('rm_encoding', Request::getString('rm_encoding', ''));
         $readmesObj->setVar('rm_downloadurl', Request::getString('rm_downloadurl', ''));
+        $readmesObj->setVar('rm_baseurl', Request::getString('rm_baseurl', ''));
         $readmeDatecreatedObj = \DateTime::createFromFormat(_SHORTDATESTRING, Request::getString('rm_datecreated'));
         $readmesObj->setVar('rm_datecreated', $readmeDatecreatedObj->getTimestamp());
         $readmesObj->setVar('rm_submitter', Request::getInt('rm_submitter', 0));

diff --git a/class/Readmes.php b/class/Readmes.php
@@ -47,6 +47,7 @@ public function __construct()
         $this->initVar('rm_content', XOBJ_DTYPE_TXTAREA);
         $this->initVar('rm_encoding', XOBJ_DTYPE_TXTBOX);
         $this->initVar('rm_downloadurl', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('rm_baseurl', XOBJ_DTYPE_TXTBOX);
         $this->initVar('rm_datecreated', XOBJ_DTYPE_INT);
         $this->initVar('rm_submitter', XOBJ_DTYPE_INT);
     }
@@ -109,6 +110,8 @@ public function getFormReadmes($action = false, $start = 0, $limit = 0)
         $form->addElement(new \XoopsFormText(_AM_WGGITHUB_README_ENCODING, 'rm_encoding', 50, 255, $this->getVar('rm_encoding')));
         // Form Text rmDownloadurl
         $form->addElement(new \XoopsFormText(_AM_WGGITHUB_README_DOWNLOADURL, 'rm_downloadurl', 50, 255, $this->getVar('rm_downloadurl')));
+        // Form Text rmBaseurl
+        $form->addElement(new \XoopsFormText(_AM_WGGITHUB_README_BASEURL, 'rm_baseurl', 50, 255, $this->getVar('rm_baseurl')));
         // Form Text Date Select rmDatecreated
         $rmDatecreated = $this->isNew() ?: $this->getVar('rm_datecreated');
         $form->addElement(new \XoopsFormTextDateSelect(_AM_WGGITHUB_README_DATECREATED, 'rm_datecreated', '', $rmDatecreated));
@@ -145,11 +148,32 @@ public function getValuesReadmes($keys = null, $format = null, $maxDepth = null)
         $rmName = $this->getVar('rm_name');
         $ret['name']          = $rmName;
         $ret['type']          = $this->getVar('rm_type');
+        $baseUrl              = $this->getVar('rm_baseurl');
+        $ret['baseurl']       = $baseUrl;
         $ret['content']       = $this->getVar('rm_content', 'e');
         $contentDecoded = base64_decode($this->getVar('rm_content', 'n'));
         if ('.MD' == substr(strtoupper($rmName), -3)) {
             $Parsedown = new MDParser\Parsedown();
-            $contentClean = $Parsedown->text($contentDecoded);
+            $contentEncoded = $Parsedown->text($contentDecoded);
+            $baseUrl = str_replace('/blob/', '/raw/', $baseUrl);
+            //replace image links
+            $arrSearch = [
+                'src=".gitbook/assets/',
+                "src='.gitbook/assets/",
+                'src="en/assets/',
+                "src='en/assets/",
+                'src="assets/',
+                "src='assets/"
+            ];
+            $arrReplace = [
+                'src="' . $baseUrl . '.gitbook/assets/',
+                "src='" . $baseUrl . '.gitbook/assets/',
+                'src="' . $baseUrl . 'en/assets/',
+                "src='" . $baseUrl . 'en/assets/',
+                'src="' . $baseUrl . 'assets/',
+                "src='" . $baseUrl . 'assets/'
+            ];
+            $contentClean = str_replace($arrSearch, $arrReplace, $contentEncoded);
         } else {
             $contentClean = $contentDecoded;
         }

diff --git a/class/ReadmesHandler.php b/class/ReadmesHandler.php
@@ -227,19 +227,11 @@ public function updateReadmes($repoId, $userName, $repoName)
             $readmesObj->setVar('rm_repoid', $repoId);
             $readmesObj->setVar('rm_name', $readme['name']);
             $readmesObj->setVar('rm_type', $readme['type']);
-            /*
-             * TODO
-            $contentDecoded = base64_decode($this->getVar('rm_content', 'n'));
-            if ('.MD' == substr(strtoupper($readme['name']), -3)) {
-                $contentClean = convertMD($contentDecoded);
-            } else {
-                $contentClean = $contentDecoded;
-            }
-            $readmesObj->setVar('rm_content', $contentClean);
-            */
             $readmesObj->setVar('rm_content', $readme['content']);
             $readmesObj->setVar('rm_encoding', $readme['encoding']);
             $readmesObj->setVar('rm_downloadurl', $readme['download_url']);
+            $baseurl = \substr($readme['html_url'], 0, \strrpos($readme['html_url'], '/') + 1);
+            $readmesObj->setVar('rm_baseurl', $baseurl);
             $readmesObj->setVar('rm_datecreated',time());
             $readmesObj->setVar('rm_submitter', $submitter);
             // Insert Data
@@ -253,7 +245,6 @@ public function updateReadmes($repoId, $userName, $repoName)
 
     /**
      * convert md file content into clean text
-     * TODO: and replace relative path for images into full path
      *
      * @param $contentDecoded
      * @return string
@@ -264,8 +255,6 @@ public function convertMD($contentDecoded)
         $Parsedown = new MDParser\Parsedown();
         $contentClean = $Parsedown->text($contentDecoded);
 
-        //replace image links
-
         return $contentClean;
     }
 

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -11,6 +11,7 @@
  - added content type for directories (goffy)
  - added link creation for gitbook (goffy)
  - removed unnecessary files (goffy)
+ - replacement of relative paths for gitbook (goffy)
 
 ===================================================================
 2020/10/11 Version 1.01 alpha

diff --git a/include/update.php b/include/update.php
@@ -115,7 +115,7 @@ function wggithub_check_db($module)
     $ret = true;
     //insert here code for database check
 
-    // Example: update table (add new field)
+    // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_release';
     $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
@@ -129,7 +129,7 @@ function wggithub_check_db($module)
         }
     }
 
-    // Example: update table (add new field)
+    // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_prerelease';
     $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
@@ -142,7 +142,7 @@ function wggithub_check_db($module)
             $ret = false;
         }
     }
-    // Example: update table (add new field)
+    // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_readme';
     $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
@@ -156,7 +156,7 @@ function wggithub_check_db($module)
         }
     }
 
-    // Example: update table (add new field)
+    // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_directories');
     $field   = 'dir_filterrelease';
     $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
@@ -170,7 +170,7 @@ function wggithub_check_db($module)
         }
     }
 
-    // Example: create new table
+    // create new table
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_logs');
     $check   = $GLOBALS['xoopsDB']->queryF("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='$table'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
@@ -192,7 +192,7 @@ function wggithub_check_db($module)
         }
     }
 
-    // Example: update table (add new field)
+    // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_directories');
     $field   = 'dir_content';
     $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
@@ -206,7 +206,7 @@ function wggithub_check_db($module)
         }
     }
 
-    // Example: update table (add new field)
+    // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_directories');
     $field   = 'dir_descr';
     $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
@@ -220,5 +220,19 @@ function wggithub_check_db($module)
         }
     }
 
+    // update table (add new field)
+    $table   = $GLOBALS['xoopsDB']->prefix('wggithub_readmes');
+    $field   = 'rm_baseurl';
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
+    if (!$numRows) {
+        $sql = "ALTER TABLE `$table` ADD `$field` VARCHAR(255) NOT NULL DEFAULT '' AFTER `rm_downloadurl`;";
+        if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
+            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            $module->setErrors("Error when adding '$field' to table '$table'.");
+            $ret = false;
+        }
+    }
+
     return $ret;
 }
diff --git a/index.php b/index.php
@@ -231,9 +231,11 @@
             require __DIR__ . '/footer.php';
         }
         $dirName = Request::getString('dir_name', '');
+        $start   = 0; //reset to default
+        $limit   = Request::getInt('limit', $helper->getConfig('userpager'));
+        $redir   = 'index.php?op=list_afterupdate&amp;start=' . $start . '&amp;limit=' . $limit . '&amp;release=' . $filterRelease . '&amp;sortby=' . $filterSortby;
         $githubClient = GithubClient::getInstance();
         $result = $githubClient->executeUpdate($dirName);
-        $redir = 'index.php?op=list_afterupdate&amp;start=' . $start . '&amp;limit=' . $limit . '&amp;release=' . $filterRelease . '&amp;sortby=' . $filterSortby;
         if ($result) {
             \redirect_header($redir, 2, \_MA_WGGITHUB_READGH_SUCCESS);
         } else {
@@ -247,11 +249,13 @@
             $GLOBALS['xoopsTpl']->assign('error', \_NOPERM);
             require __DIR__ . '/footer.php';
         }
-        $repoId = Request::getInt('repo_id', 0);
-        $repoUser  = Request::getString('repo_user', 'none');
-        $repoName  = Request::getString('repo_name', 'none');
+        $start    = 0; //reset to default
+        $limit    = Request::getInt('limit', $helper->getConfig('userpager'));
+        $repoId   = Request::getInt('repo_id', 0);
+        $repoUser = Request::getString('repo_user', 'none');
+        $repoName = Request::getString('repo_name', 'none');
+        $redir    = 'index.php?op=list_afterupdate&amp;start=' . $start . '&amp;limit=' . $limit . '&amp;release=' . $filterRelease . '&amp;sortby=' . $filterSortby;
         $result = $helper->getHandler('Readmes')->updateReadmes($repoId, $repoUser, $repoName);
-        $redir = 'index.php?op=list_afterupdate&amp;start=' . $start . '&amp;limit=' . $limit . '&amp;release=' . $filterRelease . '&amp;sortby=' . $filterSortby;
         if ($result) {
             \redirect_header($redir, 2, \_MA_WGGITHUB_READGH_SUCCESS);
         } else {

diff --git a/language/english/admin.php b/language/english/admin.php
@@ -144,6 +144,7 @@
 \define('_AM_WGGITHUB_README_CONTENT', 'Content');
 \define('_AM_WGGITHUB_README_ENCODING', 'Encoding');
 \define('_AM_WGGITHUB_README_DOWNLOADURL', 'Download url');
+\define('_AM_WGGITHUB_README_BASEURL', 'Base url');
 \define('_AM_WGGITHUB_README_DATECREATED', 'Datecreated');
 \define('_AM_WGGITHUB_README_SUBMITTER', 'Submitter');
 // Release add/edit

diff --git a/language/german/admin.php b/language/german/admin.php
@@ -144,6 +144,7 @@
 \define('_AM_WGGITHUB_README_CONTENT', 'Inhalt');
 \define('_AM_WGGITHUB_README_ENCODING', 'Encoding');
 \define('_AM_WGGITHUB_README_DOWNLOADURL', 'Download Url');
+\define('_AM_WGGITHUB_README_BASEURL', 'Base url');
 \define('_AM_WGGITHUB_README_DATECREATED', 'Datum erstellt');
 \define('_AM_WGGITHUB_README_SUBMITTER', 'Einsender');
 // Release add/edit

diff --git a/sql/mysql.sql b/sql/mysql.sql
@@ -88,6 +88,7 @@ CREATE TABLE `wggithub_readmes` (
   `rm_content` TEXT NOT NULL ,
   `rm_encoding` VARCHAR(50) NOT NULL DEFAULT '',
   `rm_downloadurl` VARCHAR(255) NOT NULL DEFAULT '',
+  `rm_baseurl` VARCHAR(255) NOT NULL DEFAULT '',
   `rm_datecreated` INT(11) NOT NULL DEFAULT '0',
   `rm_submitter` INT(10) NOT NULL DEFAULT '0',
   PRIMARY KEY (`rm_id`)

diff --git a/templates/admin/wggithub_admin_readmes.tpl b/templates/admin/wggithub_admin_readmes.tpl
@@ -12,6 +12,7 @@
 				<th class="center"><{$smarty.const._AM_WGGITHUB_README_CONTENT}></th>
 				<th class="center"><{$smarty.const._AM_WGGITHUB_README_ENCODING}></th>
 				<th class="center"><{$smarty.const._AM_WGGITHUB_README_DOWNLOADURL}></th>
+				<th class="center"><{$smarty.const._AM_WGGITHUB_README_BASEURL}></th>
 				<th class="center"><{$smarty.const._AM_WGGITHUB_README_DATECREATED}></th>
 				<th class="center"><{$smarty.const._AM_WGGITHUB_README_SUBMITTER}></th>
 				<th class="center width5"><{$smarty.const._AM_WGGITHUB_FORM_ACTION}></th>
@@ -28,6 +29,7 @@
 				<td class='center'><{$readme.content_short}></td>
 				<td class='center'><{$readme.encoding}></td>
 				<td class='center'><{$readme.downloadurl}></td>
+				<td class='center'><{$readme.baseurl}></td>
 				<td class='center'><{$readme.datecreated}></td>
 				<td class='center'><{$readme.submitter}></td>
 				<td class="center  width5">

diff --git a/templates/wggithub_index.tpl b/templates/wggithub_index.tpl
@@ -30,7 +30,7 @@
 
 	<div class="tab-content tab-content-main">
 		<div id="home" class="maintab tab-pane fade <{if $menu == 0}>in active<{/if}>">
-			<p class="center"><img class="tabcontent-logo" src="<{$wggithub_image_url}>/logoModule.png" alt="<{$smarty.const._MA_WGGITHUB_TITLE}>" title="<{$smarty.const._MA_WGGITHUB_TITLE}>"></p>
+			<p class="center"><img class="tabcontent-logo" src="assets/images/logoModule.png" alt="<{$smarty.const._MA_WGGITHUB_TITLE}>" title="<{$smarty.const._MA_WGGITHUB_TITLE}>"></p>
 			<h3><{$smarty.const._MA_WGGITHUB_DESC}></h3>
 			<p><{$smarty.const._MA_WGGITHUB_INDEX_DESC}></p>
 			<p class="tabcontent-lastupdate"><{$smarty.const._MA_WGGITHUB_INDEX_LASTUPDATE}>: <{$lastUpdate}> GMT</p>
@@ -48,7 +48,7 @@
 				<h4>
 					<{$directory.countRepos}>
 					<{if $permGlobalRead && ($directory.dir_autoupdate == 0)}>
-					<a id="btn_update" class="btn btn-primary btn-sm pull-right" href="index.php?op=update_dir&amp;dir_name=<{$directory.name}>"><{$smarty.const._MA_WGGITHUB_DIRECTORY_UPDATE}> </a>
+					<a id="btn_update" class="btn btn-primary btn-sm pull-right" href="index.php?op=update_dir&amp;dir_name=<{$directory.name}>&amp;start=<{$start}>&amp;limit=<{$limit}>"><{$smarty.const._MA_WGGITHUB_DIRECTORY_UPDATE}> </a>
 					<{/if}>
 				</h4>
 				<p><{$directory.descr}></p>
@@ -130,14 +130,15 @@
 
 	el.parentNode.replaceChild(elClone, el);
 
+	if (location.protocol == 'https:') {
+		var imgs = document.getElementsByTagName("img");
+		var imgSrc = '';
 
-	var imgs = document.getElementsByTagName("img");
-	var imgSrc = '';
-
-	for (var i = 0; i < imgs.length; i++) {
-		imgSrc = imgs[i].src;
-		imgSrc = imgSrc.replace("http:", "https:");
-		imgs[i].src = imgSrc;
+		for (var i = 0; i < imgs.length; i++) {
+			imgSrc = imgs[i].src;
+			imgSrc = imgSrc.replace("http:", "https:");
+			imgs[i].src = imgSrc;
+		}
 	}
 
 </script>

diff --git a/testdata/english/group_permission.yml b/testdata/english/group_permission.yml
@@ -1,50 +1,50 @@
 -
-    gperm_groupid: '2'
+    gperm_groupid: '3'
     gperm_itemid: '1'
-    gperm_modid: '23'
+    gperm_modid: '29'
     gperm_name: wggithub_ac
 -
-    gperm_groupid: '1'
-    gperm_itemid: '3'
-    gperm_modid: '23'
+    gperm_groupid: '2'
+    gperm_itemid: '1'
+    gperm_modid: '29'
     gperm_name: wggithub_ac
 -
     gperm_groupid: '1'
-    gperm_itemid: '2'
-    gperm_modid: '23'
+    gperm_itemid: '1'
+    gperm_modid: '29'
     gperm_name: wggithub_ac
 -
     gperm_groupid: '1'
-    gperm_itemid: '1'
-    gperm_modid: '23'
+    gperm_itemid: '3'
+    gperm_modid: '29'
     gperm_name: wggithub_ac
 -
-    gperm_groupid: '3'
-    gperm_itemid: '1'
-    gperm_modid: '23'
+    gperm_groupid: '1'
+    gperm_itemid: '2'
+    gperm_modid: '29'
     gperm_name: wggithub_ac
 -
     gperm_groupid: '2'
     gperm_itemid: '1'
-    gperm_modid: '23'
+    gperm_modid: '29'
     gperm_name: wgsimpleacc_ac
 -
     gperm_groupid: '1'
-    gperm_itemid: '1'
-    gperm_modid: '23'
+    gperm_itemid: '3'
+    gperm_modid: '29'
     gperm_name: wgsimpleacc_ac
 -
-    gperm_groupid: '1'
-    gperm_itemid: '3'
-    gperm_modid: '23'
+    gperm_groupid: '3'
+    gperm_itemid: '1'
+    gperm_modid: '29'
     gperm_name: wgsimpleacc_ac
 -
     gperm_groupid: '1'
     gperm_itemid: '2'
-    gperm_modid: '23'
+    gperm_modid: '29'
     gperm_name: wgsimpleacc_ac
 -
-    gperm_groupid: '3'
+    gperm_groupid: '1'
     gperm_itemid: '1'
-    gperm_modid: '23'
+    gperm_modid: '29'
     gperm_name: wgsimpleacc_ac