gemstracker-svn

[Gemstracker-svn] SF.net SVN: gemstracker:[172] trunk/library/classes/Gems/Project/ ProjectSettings.php

[<gem...@li...>]

Revision: 172
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=172&view=rev
Author:   matijsdejong
Date:     2011-11-03 13:23:03 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Whoops.. bug

Modified Paths:
--------------
    trunk/library/classes/Gems/Project/ProjectSettings.php

Modified: trunk/library/classes/Gems/Project/ProjectSettings.php
===================================================================
--- trunk/library/classes/Gems/Project/ProjectSettings.php	2011-11-03 13:10:10 UTC (rev 171)
+++ trunk/library/classes/Gems/Project/ProjectSettings.php	2011-11-03 13:23:03 UTC (rev 172)
@@ -141,9 +141,9 @@
         $salt = $this->offsetExists('salt') ? $this->offsetGet('salt') : '';
 
         if (false === strpos($salt, '%s')) {
+            return md5($salt . $value, false);
+        } else {
             return md5(sprintf($salt, $value), false);
-        } else {
-            return md5($salt . $value, false);
         }
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[218] trunk/library/classes/Gems/Project/ ProjectSettings.php

[<gem...@li...>]

Revision: 218
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=218&view=rev
Author:   mennodekker
Date:     2011-11-15 11:05:57 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
Fixed multiLocale

Modified Paths:
--------------
    trunk/library/classes/Gems/Project/ProjectSettings.php

Modified: trunk/library/classes/Gems/Project/ProjectSettings.php
===================================================================
--- trunk/library/classes/Gems/Project/ProjectSettings.php	2011-11-15 10:29:43 UTC (rev 217)
+++ trunk/library/classes/Gems/Project/ProjectSettings.php	2011-11-15 11:05:57 UTC (rev 218)
@@ -143,7 +143,7 @@
             $this->offsetSet('name', GEMS_PROJECT_NAME);
         }
 
-        $this->offsetSet('multiLocale', isset($project->locales) && (count($project->locales) > 1));
+        $this->offsetSet('multiLocale', $this->offsetExists('locales') && (count($this->offsetGet('locales')) > 1));
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[589] trunk/library/classes/Gems/Project/ ProjectSettings.php

[<gem...@li...>]

Revision: 589
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=589&view=rev
Author:   matijsdejong
Date:     2012-03-30 21:03:38 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
Whoops mistake

Modified Paths:
--------------
    trunk/library/classes/Gems/Project/ProjectSettings.php

Modified: trunk/library/classes/Gems/Project/ProjectSettings.php
===================================================================
--- trunk/library/classes/Gems/Project/ProjectSettings.php	2012-03-30 20:36:44 UTC (rev 588)
+++ trunk/library/classes/Gems/Project/ProjectSettings.php	2012-03-30 21:03:38 UTC (rev 589)
@@ -285,7 +285,7 @@
      */
     public function getInitialPassword()
     {
-        if (isset($this['password']['initialPassword'])) {
+        if (isset($this['password'], $this['password']['initialPassword'])) {
             return $this['password']['initialPassword'];
         } else {
             return null;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[893] trunk/library/classes/Gems/Project/ ProjectSettings.php

[<gem...@li...>]

Revision: 893
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=893&view=rev
Author:   mennodekker
Date:     2012-08-13 08:12:00 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
Make sure logLevel is interpreted as integer

Modified Paths:
--------------
    trunk/library/classes/Gems/Project/ProjectSettings.php

Modified: trunk/library/classes/Gems/Project/ProjectSettings.php
===================================================================
--- trunk/library/classes/Gems/Project/ProjectSettings.php	2012-08-07 11:17:16 UTC (rev 892)
+++ trunk/library/classes/Gems/Project/ProjectSettings.php	2012-08-13 08:12:00 UTC (rev 893)
@@ -365,7 +365,7 @@
             }
         }
 
-        return $logLevel;
+        return (int) $logLevel;
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[1075] trunk/library/classes/Gems/Project/ ProjectSettings.php

[<gem...@li...>]

Revision: 1075
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1075&view=rev
Author:   matijsdejong
Date:     2012-12-28 13:55:22 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
Fix error in array check

Modified Paths:
--------------
    trunk/library/classes/Gems/Project/ProjectSettings.php

Modified: trunk/library/classes/Gems/Project/ProjectSettings.php
===================================================================
--- trunk/library/classes/Gems/Project/ProjectSettings.php	2012-12-27 19:20:28 UTC (rev 1074)
+++ trunk/library/classes/Gems/Project/ProjectSettings.php	2012-12-28 13:55:22 UTC (rev 1075)
@@ -349,7 +349,7 @@
      */
     public function getJQueryLocal()
     {
-        if (isset($this['jquery']['local'])) {
+        if (isset($this['jquery'], $this['jquery']['local'])) {
             return $this['jquery']['local'];
         } else {
             return null;
@@ -531,6 +531,6 @@
      */
     public function isJQueryLocal()
     {
-        return isset($this['jquery']['local']);
+        return isset($this['jquery'], $this['jquery']['local']);
     }
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.