Changeset 468 for trunk/lib/PEdit.inc.php

Timestamp:

Feb 20, 2014 3:03:59 AM (10 years ago)

Author:

anonymous

Message:

Completed integrating ^{/branches/eli_branch into} /trunk. Changes include:

• Removed closing ?> from end of files
• Upgrade old-style contructor methods to use construct() instead.
• Class properties and methods defined as public, private, static or protected
• Ensure code runs under E_ALL with only mysql_* deprecated warnings
• Search for the '@' symbol anywhere it might be used to supress runtime errors, then replace with proper error recovery.
• Run the php cli -l option to check files for syntax errors.
• Bring tests up-to-date with latest version and methods of PHPUnit

Location:

trunk

Files:

• . (modified) (1 prop)
• lib/PEdit.inc.php (modified) (23 diffs)

trunk/lib/PEdit.inc.php

@@ -70 +70 @@
 
     // PEdit object parameters.
-    var $_params = array(
+    private $_params = array(
         'data_dir' => '',
         'character_set' => 'utf-8',
@@ -77 +77 @@
     );
 
-    var $_data = array(); // Array to store loaded data.
-    var $_data_file = ''; // Full file path to the pedit data file.
-    var $_authorized = false; // User is authenticated to see extended functions.
-    var $_data_loaded = false;
-    var $op = '';
+    private $_data = array(); // Array to store loaded data.
+    private $_data_file = ''; // Full file path to the pedit data file.
+    private $_authorized = false; // User is authenticated to see extended functions.
+    private $_data_loaded = false;
+    public $op = '';
 
     /**
@@ -93 +93 @@
      * @param optional array $params  A hash containing connection parameters.
      */
-    function PEdit($params)
+    public function __construct($params)
     {
         $this->setParam($params);
@@ -121 +121 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
         $app =& App::getInstance();
@@ -140 +140 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
         $app =& App::getInstance();
@@ -159 +159 @@
     * @since    12 Apr 2006 12:43:47
     */
-    function start($initialize_data_file=false)
+    public function start($initialize_data_file=false)
     {
         $app =& App::getInstance();
@@ -217 +217 @@
      * @param array     $options         Additional options to store with this data.
      */
-    function set($name, $options=array())
+    public function set($name, $options=array())
     {
         $app =& App::getInstance();
@@ -236 +236 @@
      * @return string        The trimmed content of the named data.
      */
-    function get($name)
+    public function get($name)
     {
         $name = preg_replace('/\s/', '_', $name);
@@ -251 +251 @@
      * @return bool  False if unauthorized or current page is a version.
      */
-    function formBegin()
+    public function formBegin()
     {
         $app =& App::getInstance();
@@ -288 +288 @@
      * @access public
      */
-    function printAllForms()
+    public function printAllForms()
     {
         if ($this->_authorized && $this->op == 'Edit' && is_array($this->_data) && $this->_data_loaded) {
@@ -305 +305 @@
      * @param string $type      Type of form to print. Currently only 'text' and 'textarea' supported.
      */
-    function printForm($name, $type='text')
+    public function printForm($name, $type='text')
     {
         if ($this->_authorized && $this->op == 'Edit' && $this->_data_loaded) {
@@ -345 +345 @@
      * @return bool  False if unauthorized or current page is a version.
      */
-    function formEnd()
+    public function formEnd()
     {
         if (!$this->_authorized || empty($this->_data)) {
@@ -399 +399 @@
      * @access public
      */
-    function printVersions()
+    public function printVersions()
     {
         $app =& App::getInstance();
@@ -442 +442 @@
     * @since    12 Apr 2006 10:52:35
     */
-    function _fileHash()
+    private function _fileHash()
     {
         $app =& App::getInstance();
@@ -457 +457 @@
     * @since    11 Apr 2006 20:36:26
     */
-    function _loadDataFile()
+    private function _loadDataFile()
     {
         $app =& App::getInstance();
@@ -496 +496 @@
     * @since    11 Apr 2006 20:53:42
     */
-    function _initializeDataFile()
+    private function _initializeDataFile()
     {
         $app =& App::getInstance();
@@ -512 +512 @@
      * @return bool  False if unauthorized or on failure. True on success.
      */
-    function _writeData()
+    private function _writeData()
     {
         $app =& App::getInstance();
@@ -560 +560 @@
     * @since    11 Apr 2006 22:48:30
     */
-    function _filePutContents($filename, $content)
+    private function _filePutContents($filename, $content)
     {
         $app =& App::getInstance();
@@ -610 +610 @@
      * @return bool  False on failure. True on success.
      */
-    function _createVersion()
+    private function _createVersion()
     {
         $app =& App::getInstance();
@@ -648 +648 @@
     * @since    12 Apr 2006 11:08:11
     */
-    function _deleteOldVersions()
+    private function _deleteOldVersions()
     {
         $app =& App::getInstance();
@@ -676 +676 @@
      * @return array  Array of versions.
      */
-    function _getVersions()
+    private function _getVersions()
     {
         $version_files = array();
@@ -707 +707 @@
      * @return bool  False on failure. True on success.
      */
-    function _restoreVersion($version)
+    private function _restoreVersion($version)
     {
         $app =& App::getInstance();
@@ -742 +742 @@
 
 } // End class.
-
-?>