diff --git a/www/data/programs/desc/BefunGen/01_Manuals/BefunExec_CaptureGifDialog.png b/www/data/programs/desc/BefunGen/01_Manuals/BefunExec_CaptureGifDialog.png new file mode 100644 index 0000000..dbe6c35 Binary files /dev/null and b/www/data/programs/desc/BefunGen/01_Manuals/BefunExec_CaptureGifDialog.png differ diff --git a/www/data/programs/desc/BefunGen/01_Manuals/BefunExec_ESH_example.png b/www/data/programs/desc/BefunGen/01_Manuals/BefunExec_ESH_example.png new file mode 100644 index 0000000..d60e3c7 Binary files /dev/null and b/www/data/programs/desc/BefunGen/01_Manuals/BefunExec_ESH_example.png differ diff --git a/www/data/programs/desc/BefunGen/01_Manuals/BefunExec_Main.png b/www/data/programs/desc/BefunGen/01_Manuals/BefunExec_Main.png new file mode 100644 index 0000000..53d740d Binary files /dev/null and b/www/data/programs/desc/BefunGen/01_Manuals/BefunExec_Main.png differ diff --git a/www/data/programs/desc/BefunGen/01_Manuals/BefunWrite_Main.png b/www/data/programs/desc/BefunGen/01_Manuals/BefunWrite_Main.png new file mode 100644 index 0000000..4a69ae7 Binary files /dev/null and b/www/data/programs/desc/BefunGen/01_Manuals/BefunWrite_Main.png differ diff --git a/www/data/programs/desc/BefunGen/01_Manuals/BefunWrite_Settings.png b/www/data/programs/desc/BefunGen/01_Manuals/BefunWrite_Settings.png new file mode 100644 index 0000000..43febb3 Binary files /dev/null and b/www/data/programs/desc/BefunGen/01_Manuals/BefunWrite_Settings.png differ diff --git a/www/data/programs/desc/BefunGen/03_Examples/04_Fizz Buzz.markdown b/www/data/programs/desc/BefunGen/03_Examples/05_Fizz Buzz.markdown similarity index 100% rename from www/data/programs/desc/BefunGen/03_Examples/04_Fizz Buzz.markdown rename to www/data/programs/desc/BefunGen/03_Examples/05_Fizz Buzz.markdown diff --git a/www/data/programs/desc/ExtendedGitGraph/index.markdown b/www/data/programs/desc/ExtendedGitGraph/index.markdown new file mode 100644 index 0000000..46faf57 --- /dev/null +++ b/www/data/programs/desc/ExtendedGitGraph/index.markdown @@ -0,0 +1,3 @@ +A little PHP library to display and update an commit Overview from [Github](https://github.com/). + +Design-wise its similiar to the official Commit Graph from github - but you can see your commits over a bigger timeframe. \ No newline at end of file diff --git a/www/data/programs/desc/SharkSim/index.markdown b/www/data/programs/desc/SharkSim/index.markdown new file mode 100644 index 0000000..b11e1c1 --- /dev/null +++ b/www/data/programs/desc/SharkSim/index.markdown @@ -0,0 +1,14 @@ +SharkSim is my take on a Wa-Tor simulation ([wikipedia.org/wiki/Wator](wikipedia.org/wiki/Wator)) + +The rules of this [cellular automaton](http://en.wikipedia.org/wiki/Cellular_automaton) are: + +> Time passes in discrete jumps, which I shall call chronons. +> During each chronon a fish or shark may move north, east, south or west to an adjacent point, provided the point is not already occupied by a member of its own species. +> A random-number generator makes the actual choice. +> For a fish the choice is simple: select one unoccupied adjacent point at random and move there. +> If all four adjacent points are occupied, the fish does not move. +> Since hunting for fish takes priority over mere movement, the rules for a shark are more complicated: +> from the adjacent points occupied by fish, select one at random, move there and devour the fish. +> If no fish are in the neighborhood, the shark moves just as a fish does, avoiding its fellow sharks. + +My implementation is not that fancy - but it gets to a stable FPS rate of 45 with a map of the size 600x600. diff --git a/www/data/programs/desc/Sieb_des_Eratosthenes/index.markdown b/www/data/programs/desc/Sieb des Eratosthenes/index.markdown similarity index 100% rename from www/data/programs/desc/Sieb_des_Eratosthenes/index.markdown rename to www/data/programs/desc/Sieb des Eratosthenes/index.markdown diff --git a/www/data/programs/desc/jQCCounter/index.markdown b/www/data/programs/desc/jQCCounter/index.markdown new file mode 100644 index 0000000..32a4ed6 --- /dev/null +++ b/www/data/programs/desc/jQCCounter/index.markdown @@ -0,0 +1,4 @@ +This is a little handy tool - mainly for my own personal use. + +It scans a folder for (programming) projects and counts the total amount of sourcecode lines. +It also scans for todo-comments (or every other thing you can express with regex) \ No newline at end of file diff --git a/www/protected/components/widgets/views/expandedLogHeader.php b/www/protected/components/widgets/views/expandedLogHeader.php index 576ce65..b8701c2 100644 --- a/www/protected/components/widgets/views/expandedLogHeader.php +++ b/www/protected/components/widgets/views/expandedLogHeader.php @@ -14,13 +14,7 @@
getContentTagDefinition(); ?>>
-

- content); - - ?> -

+ content); ?>
\ No newline at end of file diff --git a/www/protected/models/BlogPost.php b/www/protected/models/BlogPost.php index 349b01a..121a36f 100644 --- a/www/protected/models/BlogPost.php +++ b/www/protected/models/BlogPost.php @@ -117,7 +117,7 @@ class BlogPost extends CActiveRecord $name = str_replace(' ', '_', $name); $name = preg_replace("/[^A-Za-z0-9_]/", '', $name); - return '/blog/' . $this->ID . '/' . $name; + return '/blog/' . $this->ID . '/' . rawurlencode($name); } /** diff --git a/www/protected/models/Program.php b/www/protected/models/Program.php index f63a8ab..cbd0529 100644 --- a/www/protected/models/Program.php +++ b/www/protected/models/Program.php @@ -163,7 +163,7 @@ class Program extends CActiveRecord */ public function getImagePath() { if (file_exists('images/programs/thumbnails/' . $this->Name . '.png')) - return '/images/programs/thumbnails/' . $this->Name . '.png'; + return '/images/programs/thumbnails/' . rawurlencode($this->Name) . '.png'; // else if (file_exists('images/programs/thumbnails/' . $this->Name . '.jpg')) // return '/images/programs/thumbnails/' . $this->Name . '.jpg'; else throw new CHttpException(500, "Could not find Program Thumbnail '" . $this->Name . "'"); @@ -173,14 +173,14 @@ class Program extends CActiveRecord * @return string */ public function getLink() { - return '/programs/view/' . $this->Name; + return '/programs/view/' . rawurlencode($this->Name); } /** * @return string */ public function getDownloadLink() { - return '/programs/download/' . $this->Name; + return '/programs/download/' . rawurlencode($this->Name); } /** @@ -188,7 +188,7 @@ class Program extends CActiveRecord */ public function getDirectDownloadLink() { if ($this->download_url == 'direkt' || is_null($this->download_url) || empty($this->download_url)) - return '/data/programs/' . $this->Name . '.zip'; + return '/data/programs/' . rawurlencode($this->Name) . '.zip'; else return $this->download_url; } diff --git a/www/protected/views/layouts/main.php b/www/protected/views/layouts/main.php index 74821e4..b0629aa 100644 --- a/www/protected/views/layouts/main.php +++ b/www/protected/views/layouts/main.php @@ -12,18 +12,15 @@ - <?php - echo $this->pageTitle; ?> + <?php echo CHtml::encode($this->pageTitle) ?> - + bootstrap->register(); ?> - - <?php echo CHtml::encode($this->pageTitle); ?>