issue #1049 : adding config param sslSelfSigned to make use of self sign...

src/configs/template.ini

@@ -49,6 +49,7 @@ mySqlTablePrefix="{mySqlTablePrefix}"
 [localfs]
 fsRoot="{fsRoot}"
 fsHost="{fsHost}"
+sslSelfSigned="0"
 
 [modules]
 image="{imageLibrary}"

src/libraries/controllers/OAuthController.php

@@ -106,6 +106,8 @@ public function flow()
         $consumer = getDb()->getCredential($token);
         $oauth = new OAuth($consumerKey,$consumerSecret,OAUTH_SIG_METHOD_HMACSHA1,OAUTH_AUTH_TYPE_AUTHORIZATION);
         $oauth->setVersion('1.0a');
+        if ($this->config->localfs->sslSelfSigned)
+          $oauth->disableSSLChecks();
         $oauth->setToken($token, $tokenSecret);
         $accessToken = $oauth->getAccessToken(sprintf('%s://%s/v1/oauth/token/access', $this->utility->getProtocol(false), $_SERVER['HTTP_HOST']), null, $verifier);
         $accessToken['oauth_consumer_key'] = $consumerKey;
@@ -135,8 +137,10 @@ public function flow()
         parse_str($_COOKIE['oauth']);
         $consumer = getDb()->getCredential($oauth_token);
         $oauth = new OAuth($oauth_consumer_key,$oauth_consumer_secret,OAUTH_SIG_METHOD_HMACSHA1,OAUTH_AUTH_TYPE_AUTHORIZATION);
+        if ($this->config->localfs->sslSelfSigned)
+          $oauth->disableSSLChecks();
         $oauth->setToken($oauth_token,$oauth_token_secret);
-        $oauth->fetch(sprintf('http://%s/v1/oauth/test?oauth_consumer_key=%s', $_SERVER['HTTP_HOST'], $oauth_consumer_key));
+        $oauth->fetch(sprintf('%s://%s/v1/oauth/test?oauth_consumer_key=%s', $this->utility->getProtocol(false), $_SERVER['HTTP_HOST'], $oauth_consumer_key));
         $response_info = $oauth->getLastResponseInfo();
         header("Content-Type: {$response_info["content_type"]}");
         echo $oauth->getLastResponse();

src/libraries/models/Utility.php

@@ -318,6 +318,13 @@ public function plural($int, $word = null, $write = true)
       return $this->returnValue(($int != 1 ? "{$word}s" : $word), $write);
   }
 
+  public function selectPlural($int, $singularForm, $pluralForm, $write = true)
+  {
+    $singularForm = $this->safe($singularForm, false);
+    $pluralForm = $this->safe($pluralForm, false);
+    return $this->returnValue(($int != 1 ? $pluralForm : $singularForm), $write);
+  }
+
   public function posessive($noun, $write = true)
   {
     if(substr($noun, -1) === 's')

src/templates/uploadConfirm.php

@@ -28,7 +28,7 @@
 
 <?php if(count($successPhotos) > 0) { ?>
   <h3>Here's a breakdown of your upload</h3>
-  <strong><span class="label label-success"><?php printf('%d %s', count($successPhotos), $this->utility->plural(count($successPhotos), 'photo', false)); ?> were uploaded successfully.</span></strong>
+  <strong><span class="label label-success"><?php printf('%d %s %s', count($successPhotos), $this->utility->plural(count($successPhotos), 'photo', false), $this->utility->selectPlural(count($successPhotos), 'was', 'were', false)); ?> uploaded successfully.</span></strong>
   <div class="upload-preview">
     <ul class="thumbnails">
       <?php foreach($successPhotos as $photo) { ?>

src/tests/libraries/models/UtilityTest.php

@@ -228,6 +228,18 @@ public function testPlural()
     $this->assertEquals('words', $res, 'plural for word with 2 incorrect');
   }
 
+  public function testSelectPlural()
+  {
+    $res = $this->utility->selectPlural(0, 'was', 'were', false);
+    $this->assertEquals('were', $res, 'plural for word with 0 selected incorrectly');
+
+    $res = $this->utility->selectPlural(1, 'was', 'were', false);
+    $this->assertEquals('was', $res, 'plural for word with 1 selected incorrectly');
+
+    $res = $this->utility->selectPlural(2, 'was', 'were', false);
+    $this->assertEquals('were', $res, 'plural for word with 2 selected incorrectly');
+  }
+
   public function testReturnValue()
   {
     $res = $this->utility->returnValue('foo', false);