Changeset 468 for trunk/lib/Captcha.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/Captcha.inc.php (modified) (9 diffs)

trunk/lib/Captcha.inc.php

@@ -54 +54 @@
 class Captcha {
 
-    var $secret_key = 'some random seed text for the md5';
-    var $random_number;
-    var $ascii_numbers = array(
+    public $secret_key = 'some random seed text for the md5';
+    public $random_number;
+    public $ascii_numbers = array(
         array(
             '  #####   ',
@@ -147 +147 @@
      * @since   20 Jan 2006 13:08:22
      */
-    function Captcha()
+    public function __construct()
     {
         $app =& App::getInstance();
@@ -164 +164 @@
      * @since   07 Dec 2005 21:59:25
      */
-    function getAsciiNumber($num=null)
+    public function getAsciiNumber($num=null)
     {
         $app =& App::getInstance();
@@ -200 +200 @@
      * @since   07 Dec 2005 22:09:04
      */
-    function printAsciiNumber()
+    public function printAsciiNumber()
     {
         $ascii = $this->getAsciiNumber($this->random_number);
@@ -213 +213 @@
      * @since   07 Dec 2005 22:09:04
      */
-    function printForm()
+    public function printForm()
     {
         $hash = $this->_getMD5key($this->random_number);
@@ -231 +231 @@
      * @since   07 Dec 2005 22:19:33
      */
-    function valid()
+    public function valid()
     {
         $number = getFormData('sc-captcha-input');
@@ -251 +251 @@
      * @since   07 Dec 2005 21:40:25
      */
-    function _getRandomNumber()
+    public function _getRandomNumber()
     {
         return mb_substr(strval(rand(10000, 99999)), 0, rand(3, 5));
@@ -265 +265 @@
      * @since   07 Dec 2005 21:53:35
      */
-    function _getMD5key($input)
+    public function _getMD5key($input)
     {
         return md5($this->secret_key . $input);
@@ -272 +272 @@
 }
 
-?>