Commits

Bogdan Savluk committed f85bde3

update extensions, add composer

  • Participants
  • Parent commits 77ac975

Comments (0)

Files changed (11)

 app/config/main.php
 app/config/console.php
 *.mwb.bak
-www/images
+www/images
+vendor
 app/extensions/admin=https://bitbucket.org/z_bodya/yii-admin
 app/extensions/settings=https://bitbucket.org/z_bodya/yii-settings
 app/extensions/imperavi-redactor-widget=[git]https://github.com/zxbodya/imperavi-redactor-widget.git
+app/extensions/redactor-upload-action=[git]https://github.com/zxbodya/yii-redactor-upload-action.git
-3417f834f613b7d99a0c5b0ad150959ba8ddb175 app/extensions/admin
+8a6b42796daf7ea1c26b9aa9910150e9f140ba61 app/extensions/admin
 3e666f5d36f57b8501fece078d57a1183d9d5412 app/extensions/chosen
 10f95710bd0c9fabee232b0b5dd6d0b9fa0c1928 app/extensions/coordinatepicker
 59b564d09b749090a666832178b77dee82ca63e5 app/extensions/datetimepicker
 f0142cc5cb14eb3dac7386fef8687347a340b6ad app/extensions/elFinder
-d6378edd2934085356c4094dc1d3e2e0cb88ce0d app/extensions/fileimagearbehavior
-c6c3d579315ac7c44d03c71c39bbc6b84d5055b9 app/extensions/galleryManager
+2f4c48e7a4e0453ba1149b80e01a83b7ad7e5326 app/extensions/fileimagearbehavior
+743ea52aacdf1b36106ea22acef4764aa5c242f2 app/extensions/galleryManager
 2c669abd97f92c898b10672b8ebf0f2f7e73ff27 app/extensions/image
-96480e918e0e8bca874975ddc30809207b4b328f app/extensions/imperavi-redactor-widget
-b41015cc5fcc809c427290746ee5afb10200306b app/extensions/multiselect
+802ff203b6ab3d63f99c3d32bec4247897508961 app/extensions/imperavi-redactor-widget
+e536edfe683a197186d3b0b71ffa1124362c7587 app/extensions/multiselect
+19eb6d1519206d9bf09f65e47e3be186d5f7b5e2 app/extensions/redactor-upload-action
 8dc517ab01762a9f33feb6e6cdef319f02c0ff05 app/extensions/settings
-29a901c09ec8ec796efe967b2eb127790a78e3ea app/extensions/swiftMailer
+bc82c45b144e5a848353f50af16256d43f2e7c65 app/extensions/swiftMailer
 4a204c302973fade3c2afdf56aec9729c5b655d5 app/extensions/tinymce

File app/yiic

-#!/usr/bin/env php
-<?php
-
-require_once(dirname(__FILE__).'/yiic.php');

File app/yiic.bat

-@echo off
-
-rem -------------------------------------------------------------
-rem  Yii command line script for Windows.
-rem  This is the bootstrap script for running yiic on Windows.
-rem -------------------------------------------------------------
-
-@setlocal
-
-set BIN_PATH=%~dp0
-
-if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
-
-"%PHP_COMMAND%" "%BIN_PATH%yiic.php" %*
-
-@endlocal

File app/yiic.php

 <?php
 
 // change the following paths if necessary
-$yiic=dirname(__FILE__).'/../../../yii-1.1.13/framework/yiic.php';
+$yiic=dirname(__FILE__).'/../../yii-1.1.13/framework/yiic.php';
 $config=dirname(__FILE__).'/config/console.php';
 
 require_once($yiic);

File composer.json

+{
+    "require": {
+        "swiftmailer/swiftmailer": "4.3.*"
+    }
+}

File composer.lock

+{
+    "hash": "77e45ff6352319b7b744c8466d14a137",
+    "packages": [
+        {
+            "name": "swiftmailer/swiftmailer",
+            "version": "v4.3.0",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/swiftmailer/swiftmailer.git",
+                "reference": "v4.3.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/swiftmailer/swiftmailer/archive/v4.3.0.zip",
+                "reference": "v4.3.0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.3-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "lib/swift_required.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Chris Corbyn"
+                }
+            ],
+            "description": "Swiftmailer, free feature-rich PHP mailer",
+            "homepage": "http://swiftmailer.org",
+            "keywords": [
+                "mail",
+                "mailer"
+            ],
+            "time": "2013-01-08 15:50:34"
+        }
+    ],
+    "packages-dev": null,
+    "aliases": [
+
+    ],
+    "minimum-stability": "stable",
+    "stability-flags": [
+
+    ]
+}

File www/index.php

 
 // change the following paths if necessary
 $yii=dirname(__FILE__).'/../../yii-1.1.13/framework/yii.php';
+$composerAutoloader=dirname(__FILE__).'/../vendor/autoload.php';
 $config=dirname(__FILE__).'/../app/config/web.php';
 
 // remove the following lines when in production mode
 // specify how many levels of call stack should be shown in each log message
 defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3);
 
+require_once($composerAutoloader);
 require_once($yii);
+
 Yii::createWebApplication($config)->run();
+#!/usr/bin/env php
+<?php
+
+require_once(dirname(__FILE__).'/app/yiic.php');
+@echo off
+
+rem -------------------------------------------------------------
+rem  Yii command line script for Windows.
+rem  This is the bootstrap script for running yiic on Windows.
+rem -------------------------------------------------------------
+
+@setlocal
+
+set BIN_PATH=%~dp0
+
+if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
+
+"%PHP_COMMAND%" "%BIN_PATH%/app/yiic.php" %*
+
+@endlocal