Fixes of v1.0 is updated. (v1.1.0)

agriya · Sep 20, 2018 · ba54722 · ba54722
1 parent 4ed6413
commit ba54722
Show file tree

Hide file tree

Showing 538 changed files with 73,444 additions and 73,311 deletions.
diff --git a/server/php/Slim/composer.json b/server/php/Slim/composer.json
@@ -11,9 +11,9 @@
 		"slim/slim": "3.*",
 		"illuminate/database": "*",
 		"illuminate/pagination": "^5.2",
-		"illuminate/events": "*",		
+		"illuminate/events": "5.4.27",		
 		"illuminate/validation": "^5.3",
-		"swiftmailer/swiftmailer": "@stable",
+		"swiftmailer/swiftmailer": "5.4.5",
 		"pavlakis/slim-cli": "*",	
 		"dereuromark/media-embed": "0.*",	
 		"illuminate/translation": "*",

diff --git a/server/php/Slim/composer.lock b/server/php/Slim/composer.lock
diff --git a/server/php/Slim/lib/Models/Activity.php b/server/php/Slim/lib/Models/Activity.php
diff --git a/server/php/Slim/lib/Models/Bid.php b/server/php/Slim/lib/Models/Bid.php
diff --git a/server/php/Slim/lib/Models/BidStatus.php b/server/php/Slim/lib/Models/BidStatus.php
diff --git a/server/php/Slim/lib/Models/Certification.php b/server/php/Slim/lib/Models/Certification.php
diff --git a/server/php/Slim/lib/Models/City.php b/server/php/Slim/lib/Models/City.php
diff --git a/server/php/Slim/lib/Models/Contact.php b/server/php/Slim/lib/Models/Contact.php
diff --git a/server/php/Slim/lib/Models/Contest.php b/server/php/Slim/lib/Models/Contest.php
diff --git a/server/php/Slim/lib/Models/ContestStatus.php b/server/php/Slim/lib/Models/ContestStatus.php
diff --git a/server/php/Slim/lib/Models/ContestType.php b/server/php/Slim/lib/Models/ContestType.php
diff --git a/server/php/Slim/lib/Models/ContestTypesPricingDay.php b/server/php/Slim/lib/Models/ContestTypesPricingDay.php
diff --git a/server/php/Slim/lib/Models/ContestTypesPricingPackage.php b/server/php/Slim/lib/Models/ContestTypesPricingPackage.php
diff --git a/server/php/Slim/lib/Models/ContestUser.php b/server/php/Slim/lib/Models/ContestUser.php
diff --git a/server/php/Slim/lib/Models/Country.php b/server/php/Slim/lib/Models/Country.php
diff --git a/server/php/Slim/lib/Models/Education.php b/server/php/Slim/lib/Models/Education.php
diff --git a/server/php/Slim/lib/Models/EmailTemplate.php b/server/php/Slim/lib/Models/EmailTemplate.php
diff --git a/server/php/Slim/lib/Models/Exam.php b/server/php/Slim/lib/Models/Exam.php
diff --git a/server/php/Slim/lib/Models/ExamAnswer.php b/server/php/Slim/lib/Models/ExamAnswer.php
diff --git a/server/php/Slim/lib/Models/ExamCategory.php b/server/php/Slim/lib/Models/ExamCategory.php
diff --git a/server/php/Slim/lib/Models/ExamLevel.php b/server/php/Slim/lib/Models/ExamLevel.php
diff --git a/server/php/Slim/lib/Models/ExamsQuestion.php b/server/php/Slim/lib/Models/ExamsQuestion.php
diff --git a/server/php/Slim/lib/Models/ExamsUser.php b/server/php/Slim/lib/Models/ExamsUser.php
@@ -62,6 +62,14 @@ public function zazpay_payment()
     {
         return $this->belongsTo('Models\ZazpayPayment', 'zazpay_payment_id', 'id');
     }
+    public function transaction()
+    {
+        return $this->belongsTo('Models\ExamsUser', 'id', 'id')->select('id', 'user_id');
+    }
+    public function foreign_transactions()
+    {
+        return $this->morphMany('Models\Transaction', 'foreign_transaction');
+    }
     public function scopeFilter($query, $params = array())
     {
         parent::scopeFilter($query, $params);

diff --git a/server/php/Slim/lib/Models/Flag.php b/server/php/Slim/lib/Models/Flag.php
diff --git a/server/php/Slim/lib/Models/FlagCategory.php b/server/php/Slim/lib/Models/FlagCategory.php
diff --git a/server/php/Slim/lib/Models/Follower.php b/server/php/Slim/lib/Models/Follower.php
diff --git a/server/php/Slim/lib/Models/FormField.php b/server/php/Slim/lib/Models/FormField.php
diff --git a/server/php/Slim/lib/Models/FormFieldGroup.php b/server/php/Slim/lib/Models/FormFieldGroup.php
diff --git a/server/php/Slim/lib/Models/FormFieldSubmission.php b/server/php/Slim/lib/Models/FormFieldSubmission.php
diff --git a/server/php/Slim/lib/Models/Ip.php b/server/php/Slim/lib/Models/Ip.php
diff --git a/server/php/Slim/lib/Models/Job.php b/server/php/Slim/lib/Models/Job.php
@@ -297,6 +297,7 @@ public function jobCategoryCountUpdation($jobId = '', $jobCategoryId = '', $user
     }
     public function processCaptured($payment_response, $id)
     {
+        global $_server_domain_url;
         $job = Job::whereIn('job_status_id', [\Constants\JobStatus::PaymentPending, \Constants\JobStatus::Draft])->find($id);
         if (!empty($job)) {
             $job->makeVisible(array(

diff --git a/server/php/Slim/lib/Models/JobApply.php b/server/php/Slim/lib/Models/JobApply.php
diff --git a/server/php/Slim/lib/Models/JobApplyClick.php b/server/php/Slim/lib/Models/JobApplyClick.php
diff --git a/server/php/Slim/lib/Models/JobCategory.php b/server/php/Slim/lib/Models/JobCategory.php
diff --git a/server/php/Slim/lib/Models/JobType.php b/server/php/Slim/lib/Models/JobType.php
diff --git a/server/php/Slim/lib/Models/Language.php b/server/php/Slim/lib/Models/Language.php
diff --git a/server/php/Slim/lib/Models/Message.php b/server/php/Slim/lib/Models/Message.php
diff --git a/server/php/Slim/lib/Models/Milestone.php b/server/php/Slim/lib/Models/Milestone.php
diff --git a/server/php/Slim/lib/Models/MoneyTransferAccount.php b/server/php/Slim/lib/Models/MoneyTransferAccount.php
diff --git a/server/php/Slim/lib/Models/Page.php b/server/php/Slim/lib/Models/Page.php
diff --git a/server/php/Slim/lib/Models/Payment.php b/server/php/Slim/lib/Models/Payment.php
diff --git a/server/php/Slim/lib/Models/PaymentGateway.php b/server/php/Slim/lib/Models/PaymentGateway.php
diff --git a/server/php/Slim/lib/Models/Portfolio.php b/server/php/Slim/lib/Models/Portfolio.php
diff --git a/server/php/Slim/lib/Models/PricingDay.php b/server/php/Slim/lib/Models/PricingDay.php
diff --git a/server/php/Slim/lib/Models/PricingPackage.php b/server/php/Slim/lib/Models/PricingPackage.php
diff --git a/server/php/Slim/lib/Models/Project.php b/server/php/Slim/lib/Models/Project.php
@@ -234,8 +234,6 @@ public function processCaptured($payment_response, $id)
             if (!empty($payment_response['paykey'])) {
                 $wallet->paypal_pay_key = $payment_response['paykey'];
             }
-             $dispatcher = Project::getEventDispatcher();
-             Project::unsetEventDispatcher();
             $project->is_paid = true;
             $project->zazpay_pay_key = $payment_response['paykey'];
             $project->update();

diff --git a/server/php/Slim/lib/Models/ProjectBid.php b/server/php/Slim/lib/Models/ProjectBid.php
diff --git a/server/php/Slim/lib/Models/ProjectBidInvoice.php b/server/php/Slim/lib/Models/ProjectBidInvoice.php
@@ -64,15 +64,7 @@ protected static function boot()
     {
         global $authUser;
         parent::boot();
-        self::updating(function ($projectBidInvoice) use ($authUser) {
-            $bids = Bid::where('id', $projectBidInvoice->bid_id)->select('user_id')->first();
-            if (($authUser['role_id'] == \Constants\ConstUserTypes::Admin) || ($authUser['id'] == $bids->user_id)) {
-                ProjectBidInvoice::ProjectBidInvoiceCountUpdation($projectBidInvoice->project_id);
-                return true;
-            }
-            return false;
-        });
-        self::saving(function ($projectBidInvoice) use ($authUser) {
+        self::saved(function ($projectBidInvoice) use ($authUser) {
             $bids = Bid::where('id', $projectBidInvoice->bid_id)->select('user_id')->first();
             if (($authUser['role_id'] == \Constants\ConstUserTypes::Admin) || ($authUser['id'] == $bids->user_id)) {
                 ProjectBidInvoice::ProjectBidInvoiceCountUpdation($projectBidInvoice->project_id);
@@ -111,10 +103,9 @@ public function scopeFilter($query, $params = array())
     }
     public function processCaptured($payment_response, $id)
     {
+        global $_server_domain_url;
         $projectBidInvoice = ProjectBidInvoice::with('bid', 'project', 'projectbidinvoiceitems')->where('id', $id)->where('is_paid', false)->first();
         if (!empty($projectBidInvoice)) {
-            $dispatcher = ProjectBidInvoice::getEventDispatcher();
-            ProjectBidInvoice::unsetEventDispatcher();
             $projectBidInvoice->is_paid = true;
             if (!empty($payment_response['paykey'])) {
                 $projectBidInvoice->paypal_pay_key = $payment_response['paykey'];
@@ -123,7 +114,6 @@ public function processCaptured($payment_response, $id)
             $projectBidInvoice->zazpay_pay_key = $payment_response['paykey'];
             $projectBidInvoice->update();
             insertActivities($projectBidInvoice->project->user_id, $projectBidInvoice->user_id, 'ProjectBidInvoice', $projectBidInvoice->id, 0, 0, \Constants\ActivityType::ProjectBidInvoicePaid, $projectBidInvoice->project_id);
-            ProjectBidInvoice::setEventDispatcher($dispatcher);
 
             updateSiteCommissionFromEmployer($projectBidInvoice->site_commission_from_employer, $projectBidInvoice->bid_id, $projectBidInvoice->project_id, $projectBidInvoice->project->user_id);
 
@@ -169,6 +159,7 @@ public function processCaptured($payment_response, $id)
             Bid::where('id', $projectBidInvoice->bid_id)->update(array(
                 'total_invoice_got_paid' => $total_invoice_got_paid
             ));
+            UpdatePaidAmountForProject($projectBidInvoice->bid_id, $projectBidInvoice->project_id);
         }
         $response = array(
             'data' => $payment_response,

diff --git a/server/php/Slim/lib/Models/ProjectBidInvoiceItems.php b/server/php/Slim/lib/Models/ProjectBidInvoiceItems.php
diff --git a/server/php/Slim/lib/Models/ProjectCategory.php b/server/php/Slim/lib/Models/ProjectCategory.php
diff --git a/server/php/Slim/lib/Models/ProjectDispute.php b/server/php/Slim/lib/Models/ProjectDispute.php
diff --git a/server/php/Slim/lib/Models/ProjectRange.php b/server/php/Slim/lib/Models/ProjectRange.php
diff --git a/server/php/Slim/lib/Models/ProjectStatus.php b/server/php/Slim/lib/Models/ProjectStatus.php
diff --git a/server/php/Slim/lib/Models/ProjectsProjectCategory.php b/server/php/Slim/lib/Models/ProjectsProjectCategory.php
diff --git a/server/php/Slim/lib/Models/Provider.php b/server/php/Slim/lib/Models/Provider.php
diff --git a/server/php/Slim/lib/Models/ProviderUser.php b/server/php/Slim/lib/Models/ProviderUser.php
diff --git a/server/php/Slim/lib/Models/Publication.php b/server/php/Slim/lib/Models/Publication.php
diff --git a/server/php/Slim/lib/Models/Question.php b/server/php/Slim/lib/Models/Question.php
diff --git a/server/php/Slim/lib/Models/QuestionAnswerOptions.php b/server/php/Slim/lib/Models/QuestionAnswerOptions.php
diff --git a/server/php/Slim/lib/Models/QuestionCategory.php b/server/php/Slim/lib/Models/QuestionCategory.php
diff --git a/server/php/Slim/lib/Models/QuestionDisplayType.php b/server/php/Slim/lib/Models/QuestionDisplayType.php
diff --git a/server/php/Slim/lib/Models/QuoteBid.php b/server/php/Slim/lib/Models/QuoteBid.php
diff --git a/server/php/Slim/lib/Models/QuoteCategoriesQuoteService.php b/server/php/Slim/lib/Models/QuoteCategoriesQuoteService.php
diff --git a/server/php/Slim/lib/Models/QuoteCategory.php b/server/php/Slim/lib/Models/QuoteCategory.php
diff --git a/server/php/Slim/lib/Models/QuoteCategoryQuoteService.php b/server/php/Slim/lib/Models/QuoteCategoryQuoteService.php
diff --git a/server/php/Slim/lib/Models/QuoteFaqAnswer.php b/server/php/Slim/lib/Models/QuoteFaqAnswer.php
diff --git a/server/php/Slim/lib/Models/QuoteFaqQuestionTemplate.php b/server/php/Slim/lib/Models/QuoteFaqQuestionTemplate.php
diff --git a/server/php/Slim/lib/Models/QuoteRequest.php b/server/php/Slim/lib/Models/QuoteRequest.php
diff --git a/server/php/Slim/lib/Models/QuoteRequestFormField.php b/server/php/Slim/lib/Models/QuoteRequestFormField.php
diff --git a/server/php/Slim/lib/Models/QuoteService.php b/server/php/Slim/lib/Models/QuoteService.php
diff --git a/server/php/Slim/lib/Models/QuoteServiceAudio.php b/server/php/Slim/lib/Models/QuoteServiceAudio.php
diff --git a/server/php/Slim/lib/Models/QuoteServicePhoto.php b/server/php/Slim/lib/Models/QuoteServicePhoto.php
diff --git a/server/php/Slim/lib/Models/QuoteServiceVideo.php b/server/php/Slim/lib/Models/QuoteServiceVideo.php
diff --git a/server/php/Slim/lib/Models/QuoteUserFaqQuestion.php b/server/php/Slim/lib/Models/QuoteUserFaqQuestion.php
diff --git a/server/php/Slim/lib/Models/ResumeRating.php b/server/php/Slim/lib/Models/ResumeRating.php
diff --git a/server/php/Slim/lib/Models/Review.php b/server/php/Slim/lib/Models/Review.php
diff --git a/server/php/Slim/lib/Models/SalaryType.php b/server/php/Slim/lib/Models/SalaryType.php
diff --git a/server/php/Slim/lib/Models/Setting.php b/server/php/Slim/lib/Models/Setting.php
diff --git a/server/php/Slim/lib/Models/Skill.php b/server/php/Slim/lib/Models/Skill.php
diff --git a/server/php/Slim/lib/Models/SkillsPortfolios.php b/server/php/Slim/lib/Models/SkillsPortfolios.php
diff --git a/server/php/Slim/lib/Models/State.php b/server/php/Slim/lib/Models/State.php
diff --git a/server/php/Slim/lib/Models/Timezone.php b/server/php/Slim/lib/Models/Timezone.php
diff --git a/server/php/Slim/lib/Models/Transaction.php b/server/php/Slim/lib/Models/Transaction.php
diff --git a/server/php/Slim/lib/Models/User.php b/server/php/Slim/lib/Models/User.php
diff --git a/server/php/Slim/lib/Models/UserCashWithdrawal.php b/server/php/Slim/lib/Models/UserCashWithdrawal.php
diff --git a/server/php/Slim/lib/Models/Vault.php b/server/php/Slim/lib/Models/Vault.php
diff --git a/server/php/Slim/lib/Models/View.php b/server/php/Slim/lib/Models/View.php
diff --git a/server/php/Slim/lib/Models/Wallet.php b/server/php/Slim/lib/Models/Wallet.php
diff --git a/server/php/Slim/lib/Models/WorkProfile.php b/server/php/Slim/lib/Models/WorkProfile.php
diff --git a/server/php/Slim/lib/Models/ZazpayIpnLog.php b/server/php/Slim/lib/Models/ZazpayIpnLog.php
diff --git a/server/php/Slim/lib/Models/ZazpayPaymentGateway.php b/server/php/Slim/lib/Models/ZazpayPaymentGateway.php
diff --git a/server/php/Slim/lib/Models/ZazpayPaymentGroup.php b/server/php/Slim/lib/Models/ZazpayPaymentGroup.php
diff --git a/server/php/Slim/lib/Models/ZazpayTransactionLog.php b/server/php/Slim/lib/Models/ZazpayTransactionLog.php
diff --git a/server/php/Slim/lib/core.php b/server/php/Slim/lib/core.php
@@ -803,7 +803,7 @@ function saveImageData($class_name, $file, $foreign_id, $is_multi = false)
 {
     if (!empty($file)) {
         $data = explode(',', $file);
-        $file = $data[1];
+        $file = (!empty($data[1])) ? $data[1] : $data[0];        
         $image = base64_decode($file);
         $f = finfo_open();
         $mime_type = finfo_buffer($f, $image, FILEINFO_MIME_TYPE);
@@ -1473,21 +1473,15 @@ function sendEntryStatusChangeAlert($contestUser, $new_status, $old_status)
 }
 function updateSiteCommissionFromEmployer($commision_amount, $bid_id, $project_id, $user_id)
 {
-    $milestoneTotalAmount = Models\Milestone::where('project_id', $project_id)->where('bid_id', $bid_id)->whereIn('milestone_status_id', [\Constants\MilestoneStatus::EscrowFunded, \Constants\MilestoneStatus::Completed, \Constants\MilestoneStatus::RequestedForRelease, \Constants\MilestoneStatus::EscrowReleased])->selectRaw('sum(site_commission_from_employer) as site_commission_from_employer')->first()->toArray();
-    $invoiceTotalAmount = Models\ProjectBidInvoice::where('project_id', $project_id)->where('is_paid', 1)->where('bid_id', $bid_id)->selectRaw('sum(site_commission_from_employer) as site_commission_from_employer')->first()->toArray();
-    $dispatcher = Models\Bid::getEventDispatcher();
-    Models\Bid::unsetEventDispatcher();
+    $milestoneTotalAmount = Models\Milestone::where('project_id', $project_id)->where('bid_id', $bid_id)->whereIn('milestone_status_id', [\Constants\MilestoneStatus::EscrowFunded, \Constants\MilestoneStatus::Completed, \Constants\MilestoneStatus::RequestedForRelease, \Constants\MilestoneStatus::EscrowReleased])->selectRaw('sum(site_commission_from_employer) as site_commission_from_employer')->first();
+    $invoiceTotalAmount = Models\ProjectBidInvoice::where('project_id', $project_id)->where('is_paid', 1)->where('bid_id', $bid_id)->selectRaw('sum(site_commission_from_employer) as site_commission_from_employer')->first();
     Models\Bid::where('id', $bid_id)->update(array(
         'site_commission_from_employer' => ($milestoneTotalAmount['site_commission_from_employer'] + $invoiceTotalAmount['site_commission_from_employer'])
     ));
-    Models\Bid::setEventDispatcher($dispatcher);
-    $dispatcher = Models\Project::getEventDispatcher();
-    Models\Project::unsetEventDispatcher();
     Models\Project::where('id', $project_id)->update(array(
         'site_commission_from_employer' => ($milestoneTotalAmount['site_commission_from_employer'] + $invoiceTotalAmount['site_commission_from_employer'])
     ));
-    Models\Project::setEventDispatcher($dispatcher);
-    $employerCommission = Models\Project::where('user_id', $user_id)->selectRaw('sum(site_commission_from_employer) as site_commission_from_employer')->first()->toArray();
+    $employerCommission = Models\Project::where('user_id', $user_id)->selectRaw('sum(site_commission_from_employer) as site_commission_from_employer')->first();
     if (!empty($employerCommission['site_commission_from_employer'])) {
          Models\User::where('id', $user_id)->update(array(
             'total_site_revenue_as_employer' => $employerCommission['site_commission_from_employer']
@@ -1496,21 +1490,15 @@ function updateSiteCommissionFromEmployer($commision_amount, $bid_id, $project_i
 }
 function updateSiteCommissionFromFreelancer($commision_amount, $bid_id, $project_id, $user_id)
 {
-    $milestoneTotalAmount = Models\Milestone::where('project_id', $project_id)->where('bid_id', $bid_id)->where('milestone_status_id', \Constants\MilestoneStatus::EscrowReleased)->selectRaw('sum(site_commission_from_freelancer) as site_commission_from_freelancer')->first()->toArray();
+    $milestoneTotalAmount = Models\Milestone::where('project_id', $project_id)->where('bid_id', $bid_id)->where('milestone_status_id', \Constants\MilestoneStatus::EscrowReleased)->selectRaw('sum(site_commission_from_freelancer) as site_commission_from_freelancer')->first();
     $invoiceTotalAmount = Models\ProjectBidInvoice::where('project_id', $project_id)->where('is_paid', 1)->where('bid_id', $bid_id)->selectRaw('sum(site_commission_from_freelancer) as site_commission_from_freelancer')->first()->toArray();
-    $dispatcher = Models\Bid::getEventDispatcher();
-    Models\Bid::unsetEventDispatcher();
     Models\Bid::where('id', $bid_id)->update(array(
         'site_commission_from_freelancer' => ($milestoneTotalAmount['site_commission_from_freelancer'] + $invoiceTotalAmount['site_commission_from_freelancer'])
     ));
-    Models\Bid::setEventDispatcher($dispatcher);
-    $dispatcher = Models\Project::getEventDispatcher();
-    Models\Project::unsetEventDispatcher();
     Models\Project::where('id', $project_id)->update(array(
         'site_commission_from_freelancer' => ($milestoneTotalAmount['site_commission_from_freelancer'] + $invoiceTotalAmount['site_commission_from_freelancer'])
     ));
-    Models\Project::setEventDispatcher($dispatcher);
-    $freelancerCommission = Models\Project::where('freelancer_user_id', $user_id)->selectRaw('sum(site_commission_from_freelancer) as site_commission_from_freelancer')->first()->toArray();
+    $freelancerCommission = Models\Project::where('freelancer_user_id', $user_id)->selectRaw('sum(site_commission_from_freelancer) as site_commission_from_freelancer')->first();
     if (!empty($freelancerCommission['site_commission_from_freelancer'])) {
          Models\User::where('id', $user_id)->update(array(
             'total_site_revenue_as_freelancer' => $freelancerCommission['site_commission_from_freelancer']
@@ -1519,10 +1507,10 @@ function updateSiteCommissionFromFreelancer($commision_amount, $bid_id, $project
 }
 function UpdatePaidAmountForProject($bid_id, $project_id)
 {
-    $projectTotalAmount = Models\Bid::where('project_id', $project_id)->selectRaw('sum(paid_escrow_amount) as escrow_amount, sum(total_invoice_got_paid) as invoice_amount')->first()->toArray();
+    $projectTotalAmount = Models\Bid::where('project_id', $project_id)->selectRaw('sum(paid_escrow_amount) as escrow_amount, sum(total_invoice_got_paid) as invoice_amount')->first();
     if (!empty($projectTotalAmount)) {
         $amount = $projectTotalAmount['escrow_amount'] + $projectTotalAmount['invoice_amount'];
-        Models\Project::where('id', $project_id)->increment('total_paid_amount', $amount);
+        Models\Project::where('id', $project_id)->update(['total_paid_amount' => $amount]);
     }
 }
 function getFormFields($form_field_submission)

diff --git a/server/php/Slim/lib/vendors/OAuth2/Autoloader.php b/server/php/Slim/lib/vendors/OAuth2/Autoloader.php
@@ -1,48 +1,48 @@
-<?php
-
-namespace OAuth2;
-
-/**
- * Autoloads OAuth2 classes
- *
- * @author    Brent Shaffer <bshafs at gmail dot com>
- * @license   MIT License
- */
-class Autoloader
-{
-    private $dir;
-
-    public function __construct($dir = null)
-    {
-        if (is_null($dir)) {
-            $dir = dirname(__FILE__).'/..';
-        }
-        $this->dir = $dir;
-    }
-    /**
-     * Registers OAuth2\Autoloader as an SPL autoloader.
-     */
-    public static function register($dir = null)
-    {
-        ini_set('unserialize_callback_func', 'spl_autoload_call');
-        spl_autoload_register(array(new self($dir), 'autoload'));
-    }
-
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param string $class A class name.
-     *
-     * @return boolean Returns true if the class has been loaded
-     */
-    public function autoload($class)
-    {
-        if (0 !== strpos($class, 'OAuth2')) {
-            return;
-        }
-
-        if (file_exists($file = $this->dir.'/'.str_replace('\\', '/', $class).'.php')) {
-            require $file;
-        }
-    }
-}
+<?php
+
+namespace OAuth2;
+
+/**
+ * Autoloads OAuth2 classes
+ *
+ * @author    Brent Shaffer <bshafs at gmail dot com>
+ * @license   MIT License
+ */
+class Autoloader
+{
+    private $dir;
+
+    public function __construct($dir = null)
+    {
+        if (is_null($dir)) {
+            $dir = dirname(__FILE__).'/..';
+        }
+        $this->dir = $dir;
+    }
+    /**
+     * Registers OAuth2\Autoloader as an SPL autoloader.
+     */
+    public static function register($dir = null)
+    {
+        ini_set('unserialize_callback_func', 'spl_autoload_call');
+        spl_autoload_register(array(new self($dir), 'autoload'));
+    }
+
+    /**
+     * Handles autoloading of classes.
+     *
+     * @param string $class A class name.
+     *
+     * @return boolean Returns true if the class has been loaded
+     */
+    public function autoload($class)
+    {
+        if (0 !== strpos($class, 'OAuth2')) {
+            return;
+        }
+
+        if (file_exists($file = $this->dir.'/'.str_replace('\\', '/', $class).'.php')) {
+            require $file;
+        }
+    }
+}
diff --git a/server/php/Slim/lib/vendors/OAuth2/ClientAssertionType/ClientAssertionTypeInterface.php b/server/php/Slim/lib/vendors/OAuth2/ClientAssertionType/ClientAssertionTypeInterface.php
@@ -1,15 +1,15 @@
-<?php
-
-namespace OAuth2\ClientAssertionType;
-
-use OAuth2\RequestInterface;
-use OAuth2\ResponseInterface;
-
-/**
- * Interface for all OAuth2 Client Assertion Types
- */
-interface ClientAssertionTypeInterface
-{
-    //public function validateRequest(RequestInterface $request, ResponseInterface $response);
-    //public function getClientId();
-}
+<?php
+
+namespace OAuth2\ClientAssertionType;
+
+use OAuth2\RequestInterface;
+use OAuth2\ResponseInterface;
+
+/**
+ * Interface for all OAuth2 Client Assertion Types
+ */
+interface ClientAssertionTypeInterface
+{
+    //public function validateRequest(RequestInterface $request, ResponseInterface $response);
+    //public function getClientId();
+}