Merge pull request #2 from IntegReady/20170305-dev-Minor_fixes_1

20170305 dev minor fixes 1
IntegReady · Mar 5, 2017 · 610c0b9 · 610c0b9
2 parents 85de32d + 17ffff1
commit 610c0b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CaptchaAction.php b/CaptchaAction.php
@@ -34,6 +34,8 @@ class CaptchaAction extends \yii\captcha\CaptchaAction
      */
     public function init()
     {
+        GlobalVar::$dirfonts = __DIR__ . '/fonts';
+        GlobalVar::$dirimg   = __DIR__ . '/img';
     }
 
     /**

diff --git a/GlobalVar.php b/GlobalVar.php
@@ -8,8 +8,8 @@
  */
 class GlobalVar
 {
-    public static $dirfonts   = __DIR__ . '/fonts';
-    public static $dirimg     = __DIR__ . '/img';   // absolute path to the images directory
+    public static $dirfonts;
+    public static $dirimg;   // absolute path to the images directory
     public static $symboles   = [
         '~'               => ' ',
         'alpha'           => '&#174;',

diff --git a/README.md b/README.md
@@ -9,13 +9,13 @@ The preferred way to install this extension is through [composer](http://getcomp
 Either run
 
 ```
-php composer.phar require --prefer-dist hreitsma/yii2-simplemath-captcha "dev-master"
+php composer.phar require --prefer-dist integready/yii2-simplemath-captcha "dev-master"
 ```
 
 or add
 
 ```
-"hreitsma/yii2-simplemath-captcha": "dev-master"
+"integready/yii2-simplemath-captcha": "dev-master"
 ```
 
 to the require section of your `composer.json` file.
@@ -32,7 +32,7 @@ public function actions()
 	return [
             ...
             'captcha' => [
-                'class' => 'hr\captcha\CaptchaAction',
+                'class' => 'integready\simplemathcaptcha\CaptchaAction',
                 'operators' => ['+','-','*'],
                 'maxValue' => 10,
                 'fontSize' => 18,
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,8 @@ class CaptchaAction extends \yii\captcha\CaptchaAction @@
          */
         public function init()
         {
+            GlobalVar::$dirfonts = __DIR__ . '/fonts';
+            GlobalVar::$dirimg   = __DIR__ . '/img';
         }
         /**
@@ Expand Down @@