[phpwiki-checkins] SF.net SVN: phpwiki:[10489] trunk/lib/WikiDB/backend

[<var...@us...>]

Revision: 10489
          http://sourceforge.net/p/phpwiki/code/10489
Author:   vargenau
Date:     2021-08-11 12:19:00 +0000 (Wed, 11 Aug 2021)
Log Message:
-----------
lib/WikiDB/backend/file.php & lib/WikiDB/backend/flatfile.php: add protected

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/file.php
    trunk/lib/WikiDB/backend/flatfile.php

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-08-11 10:44:37 UTC (rev 10488)
+++ trunk/lib/WikiDB/backend/file.php	2021-08-11 12:19:00 UTC (rev 10489)
@@ -85,7 +85,7 @@
 
     // *********************************************************************
     // common file load / save functions:
-    function _pagename2filename($type, $pagename, $version)
+    protected function _pagename2filename($type, $pagename, $version)
     {
         if ($version == 0)
             return $this->_dir_names[$type] . '/' . urlencode($pagename);
@@ -93,7 +93,7 @@
             return $this->_dir_names[$type] . '/' . urlencode($pagename) . '--' . $version;
     }
 
-    function _loadPage($type, $pagename, $version, $set_pagename = true)
+    protected function _loadPage($type, $pagename, $version, $set_pagename = true)
     {
         $filename = $this->_pagename2filename($type, $pagename, $version);
         if (!file_exists($filename)) return NULL;
@@ -120,7 +120,7 @@
         return NULL;
     }
 
-    function _savePage($type, $pagename, $version, $data)
+    protected function _savePage($type, $pagename, $version, $data)
     {
         $filename = $this->_pagename2filename($type, $pagename, $version);
         if ($fd = fopen($filename, 'a+b')) {
@@ -141,7 +141,7 @@
         }
     }
 
-    function _removePage($type, $pagename, $version)
+    protected function _removePage($type, $pagename, $version)
     {
         $filename = $this->_pagename2filename($type, $pagename, $version);
         if (!file_exists($filename)) return NULL;
@@ -151,10 +151,8 @@
     }
 
     // *********************************************************************
-
-    // *********************************************************************
     // Load/Save Version-Data
-    function _loadVersionData($pagename, $version)
+    protected function _loadVersionData($pagename, $version)
     {
         if ($this->_page_version_data != NULL) {
             if (($this->_page_version_data['pagename'] == $pagename) &&
@@ -175,7 +173,7 @@
         return NULL;
     }
 
-    function _saveVersionData($pagename, $version, $data)
+    protected function _saveVersionData($pagename, $version, $data)
     {
         $this->_savePage('ver_data', $pagename, $version, $data);
 
@@ -188,7 +186,7 @@
 
     // *********************************************************************
     // Load/Save Page-Data
-    function _loadPageData($pagename)
+    protected function _loadPageData($pagename)
     {
         if (isset($this->_page_data)) {
             if ($this->_page_data['pagename'] == $pagename) {
@@ -206,7 +204,7 @@
         return array(); // no values found
     }
 
-    function _savePageData($pagename, $data)
+    protected function _savePageData($pagename, $data)
     {
         $this->_savePage('page_data', $pagename, 0, $data);
     }
@@ -213,7 +211,7 @@
 
     // *********************************************************************
     // Load/Save Latest-Version
-    function _saveLatestVersions()
+    protected function _saveLatestVersions()
     {
         $data = $this->_latest_versions;
         if ($data == NULL)
@@ -221,7 +219,7 @@
         $this->_savePage('latest_ver', 'latest_versions', 0, $data);
     }
 
-    function _setLatestVersion($pagename, $version)
+    protected function _setLatestVersion($pagename, $version)
     {
         // make sure the page version list is loaded:
         $this->_getLatestVersion($pagename);
@@ -235,7 +233,7 @@
         $this->_saveLatestVersions();
     }
 
-    function _loadLatestVersions()
+    protected function _loadLatestVersions()
     {
         if ($this->_latest_versions != NULL)
             return;
@@ -247,7 +245,7 @@
             $this->_latest_versions = array(); // empty array
     }
 
-    function _getLatestVersion($pagename)
+    protected function _getLatestVersion($pagename)
     {
         $this->_loadLatestVersions();
         if (array_key_exists($pagename, $this->_latest_versions) == false)
@@ -257,7 +255,7 @@
 
     // *********************************************************************
     // Load/Save Page-Links
-    function _loadPageLinks($pagename)
+    protected function _loadPageLinks($pagename)
     {
         $pd = $this->_loadPage('links', $pagename, 0, false);
         if ($pd != NULL) {
@@ -267,7 +265,7 @@
         }
     }
 
-    function _savePageLinks($pagename, $links)
+    protected function _savePageLinks($pagename, $links)
     {
         $this->_savePage('links', $pagename, 0, $links);
     }
@@ -725,7 +723,7 @@
         return true;
     }
 
-    function _parse_searchwords($search)
+    protected function _parse_searchwords($search)
     {
         $search = strtolower(trim($search));
         if (!$search)

Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php	2021-08-11 10:44:37 UTC (rev 10488)
+++ trunk/lib/WikiDB/backend/flatfile.php	2021-08-11 12:19:00 UTC (rev 10489)
@@ -42,7 +42,7 @@
     // *********************************************************************
     // common file load / save functions:
     // FilenameForPage is from loadsave.php
-    function _pagename2filename($type, $pagename, $version)
+    protected function _pagename2filename($type, $pagename, $version)
     {
         $fpagename = FilenameForPage($pagename);
         if (strstr($fpagename, "/")) {
@@ -52,7 +52,7 @@
     }
 
     // Load/Save Page-Data
-    function _loadPageData($pagename)
+    protected function _loadPageData($pagename)
     {
         if ($this->_page_data != NULL) {
             if ($this->_page_data['pagename'] == $pagename) {
@@ -97,7 +97,7 @@
      * If the given ($pagename,$version) is already in the database,
      * this method completely overwrites any stored data for that version.
      */
-    function _saveVersionData($pagename, $version, $data)
+    protected function _saveVersionData($pagename, $version, $data)
     {
         // check if this is a newer version:
         if ($this->_getLatestVersion($pagename) < $version) {
@@ -116,7 +116,7 @@
     // Store as full page_data flatfile
     //   pagedata: date, pagename, hits
     //   versiondata: _cached_html and the rest
-    function _savePageData($pagename, $data)
+    protected function _savePageData($pagename, $data)
     {
         $type = 'page_data';
         $version = 1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.