[phpwiki-checkins] SF.net SVN: phpwiki:[9849] trunk/lib

[<var...@us...>]

Revision: 9849
          http://sourceforge.net/p/phpwiki/code/9849
Author:   vargenau
Date:     2016-05-25 09:41:56 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent

Modified Paths:
--------------
    trunk/lib/Captcha.php
    trunk/lib/Template.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WysiwygEdit/CKeditor.php
    trunk/lib/WysiwygEdit/Wikiwyg.php
    trunk/lib/WysiwygEdit/tinymce.php
    trunk/lib/editpage.php
    trunk/lib/loadsave.php
    trunk/lib/plugin/AddComment.php
    trunk/lib/plugin/CacheTest.php
    trunk/lib/plugin/Calendar.php
    trunk/lib/plugin/TexToPng.php
    trunk/lib/plugin/text2png.php

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/Captcha.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -146,10 +146,10 @@
         $height =& $this->height;
 
         // Create the Image
-        $jpg = ImageCreate($width, $height);
-        $bg = ImageColorAllocate($jpg, 255, 255, 255);
-        $tx = ImageColorAllocate($jpg, 185, 140, 140);
-        ImageFilledRectangle($jpg, 0, 0, $width, $height, $bg);
+        $jpg = imagecreate($width, $height);
+        $bg = imagecolorallocate($jpg, 255, 255, 255);
+        $tx = imagecolorallocate($jpg, 185, 140, 140);
+        imagefilledrectangle($jpg, 0, 0, $width, $height, $bg);
 
         $x = rand(0, $width);
         $y = rand(0, $height);

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/Template.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -273,7 +273,7 @@
  * For dumping pages as html to a file.
  * Used for action=dumphtml,action=ziphtml,format=pdf,format=xml
  */
-function GeneratePageasXML($content, $title, $page_revision = null, $args = array())
+function GeneratePageAsXML($content, $title, $page_revision = null, $args = array())
 {
     global $request;
 

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/WikiPluginCached.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -1010,16 +1010,16 @@
         $IMAGESIZE['height'] = $IMAGESIZE['rows'] * $chary + 2 * $marginy;
 
         // create blank image
-        $im = @ImageCreate($IMAGESIZE['width'], $IMAGESIZE['height']);
+        $im = @imagecreate($IMAGESIZE['width'], $IMAGESIZE['height']);
 
-        $col = ImageColorAllocate($im, $textcol[0], $textcol[1], $textcol[2]);
-        $bg = ImageColorAllocate($im, $bgcol[0], $bgcol[1], $bgcol[2]);
+        $col = imagecolorallocate($im, $textcol[0], $textcol[1], $textcol[2]);
+        $bg = imagecolorallocate($im, $bgcol[0], $bgcol[1], $bgcol[2]);
 
-        ImageFilledRectangle($im, 0, 0, $IMAGESIZE['width'] - 1, $IMAGESIZE['height'] - 1, $bg);
+        imagefilledrectangle($im, 0, 0, $IMAGESIZE['width'] - 1, $IMAGESIZE['height'] - 1, $bg);
 
         // write text lines
         foreach ($lines as $nr => $textstr) {
-            ImageString($im, $fontnr, $marginx, $marginy + $nr * $chary,
+            imagestring($im, $fontnr, $marginx, $marginy + $nr * $chary,
                 $textstr, $col);
         }
         return $im;

Modified: trunk/lib/WysiwygEdit/CKeditor.php
===================================================================
--- trunk/lib/WysiwygEdit/CKeditor.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/WysiwygEdit/CKeditor.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -39,7 +39,7 @@
     {
         global $WikiTheme;
         $WikiTheme->addMoreHeaders
-        (Javascript('', array('src' => $this->BasePath . 'ckeditor.js',
+        (JavaScript('', array('src' => $this->BasePath . 'ckeditor.js',
             'language' => 'JavaScript')));
         return JavaScript("
 window.onload = function()

Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -42,7 +42,7 @@
                      "Wikiwyg/Wysiwyg.js", "Wikiwyg/Phpwiki.js", "Wikiwyg/HTML.js",
                      "Wikiwyg/Toolbar.js") as $js) {
             $WikiTheme->addMoreHeaders
-            (Javascript('', array('src' => $this->BasePath . '/' . $js,
+            (JavaScript('', array('src' => $this->BasePath . '/' . $js,
                 'language' => 'JavaScript')));
         }
         $doubleClickToEdit = ($request->getPref('doubleClickEdit') or ENABLE_DOUBLECLICKEDIT)

Modified: trunk/lib/WysiwygEdit/tinymce.php
===================================================================
--- trunk/lib/WysiwygEdit/tinymce.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/WysiwygEdit/tinymce.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -31,9 +31,9 @@
     {
         global $LANG, $WikiTheme;
         $WikiTheme->addMoreHeaders
-        (Javascript('', array('src' => $this->BasePath . 'tiny_mce.js',
+        (JavaScript('', array('src' => $this->BasePath . 'tiny_mce.js',
             'language' => 'JavaScript')));
-        return Javascript("
+        return JavaScript("
 tinyMCE.init({
     mode    : 'exact',
     elements: '$name',

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/editpage.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -626,7 +626,7 @@
             $undo_btn = $WikiTheme->getImageURL("ed_undo.png");
             $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
             // JS_SEARCHREPLACE from walterzorn.de
-            $js = Javascript("
+            $js = JavaScript("
 uri_undo_btn   = '" . $undo_btn . "'
 msg_undo_alt   = '" . _("Undo") . "'
 uri_undo_d_btn = '" . $undo_d_btn . "'

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/loadsave.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -651,7 +651,7 @@
         $msg = HTML();
 
         $DUMP_MODE = $WikiTheme->DUMP_MODE;
-        $data = GeneratePageasXML(new Template('browse', $request, $args),
+        $data = GeneratePageAsXML(new Template('browse', $request, $args),
             $pagename, $current, $args);
         $WikiTheme->DUMP_MODE = $DUMP_MODE;
 

Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/AddComment.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -93,7 +93,7 @@
         if ($args['jshide']) {
             $div = HTML::div(array('id' => 'comments', 'style' => 'display:none;'));
             //$list->setAttr('style','display:none;');
-            $div->pushContent(Javascript("
+            $div->pushContent(JavaScript("
 function togglecomments(a) {
   comments=document.getElementById('comments');
   if (comments.style.display=='none') {

Modified: trunk/lib/plugin/CacheTest.php
===================================================================
--- trunk/lib/plugin/CacheTest.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/CacheTest.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -125,7 +125,7 @@
     function produceGraphics($text, $font)
     {
         // The idea (and some code) is stolen from the text2png plugin
-        // but I did not want to use TTF. ImageString is quite ugly
+        // but I did not want to use TTF. Imagestring is quite ugly
         // and quite compatible. It's only a usage example.
 
         if ($font < 1 || $font > 5) {
@@ -134,14 +134,14 @@
             $font = 3;
         }
 
-        $ok = ($im = @ImageCreate(400, 40));
-        $bg_color = ImageColorAllocate($im, 240, 240, 240);
-        $text_color1 = ImageColorAllocate($im, 120, 120, 120);
-        $text_color2 = ImageColorAllocate($im, 0, 0, 0);
+        $ok = ($im = @imagecreate(400, 40));
+        $bg_color = imagecolorallocate($im, 240, 240, 240);
+        $text_color1 = imagecolorallocate($im, 120, 120, 120);
+        $text_color2 = imagecolorallocate($im, 0, 0, 0);
 
-        ImageFilledRectangle($im, 0, 0, 149, 49, $bg_color);
-        ImageString($im, $font, 11, 12, $text, $text_color1);
-        ImageString($im, $font, 10, 10, $text, $text_color2);
+        imagefilledrectangle($im, 0, 0, 149, 49, $bg_color);
+        imagestring($im, $font, 11, 12, $text, $text_color1);
+        imagestring($im, $font, 10, 10, $text, $text_color2);
 
         if (!$ok) {
             // simple error handling by WikiPluginImageCache

Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/Calendar.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -119,7 +119,7 @@
 
         $fs = $this->args['wday_format'];
         $row = HTML::tr();
-        $row->setattr('class', 'cal-dayname');
+        $row->setAttr('class', 'cal-dayname');
         if ($this->args['display_weeknum'])
             $row->pushContent(HTML::td(array('class' => 'cal-dayname align-center'),
                 _("Wk")));

Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/TexToPng.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -287,7 +287,7 @@
             file_exists($tempfiles . '.png');
 
         if ($ok) {
-            if (!($img = ImageCreateFromPNG($tempfiles . '.png'))) {
+            if (!($img = imagecreatefrompng($tempfiles . '.png'))) {
                 $this->dbg("Could not open just created image file: $tempfiles");
                 $ok = false;
             }

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/text2png.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -164,7 +164,7 @@
 
             // get ready to draw
             $s = ImageTTFBBox($fontsize, 0, $ttfont, $text);
-            $im = @ImageCreate(abs($s[4]) + 20, abs($s[7]) + 10);
+            $im = @imagecreate(abs($s[4]) + 20, abs($s[7]) + 10);
             if (empty($im)) {
                 $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
                 // FIXME: Error manager does not transform URLs passed
@@ -175,27 +175,27 @@
                 return HTML::p($error_html);
             }
             $rgb = $this->hexcolor($backcolor, array(255, 255, 255));
-            $bg_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
+            $bg_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
             if ($with_shadow) {
                 $rgb = $this->hexcolor($shadowcolor, array(175, 175, 175));
-                $text_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
+                $text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
                 // shadow is 1 pixel down and 2 pixels right
                 ImageTTFText($im, $fontsize, 0, 12, abs($s[7]) + 6, $text_color, $ttfont, $text);
             }
             // draw text
             $rgb = $this->hexcolor($fontcolor, array(0, 0, 0));
-            $text_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
+            $text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
             ImageTTFText($im, $fontsize, 0, 10, abs($s[7]) + 5, $text_color, $ttfont, $text);
 
             /**
              * An alternate text drawing method in case ImageTTFText
              * doesn't work.
              **/
-            //ImageString($im, 2, 10, 40, $text, $text_color);
+            //imagestring($im, 2, 10, 40, $text, $text_color);
 
             // To dump directly to browser:
             //header("Content-type: image/png");
-            //ImagePng($im);
+            //imagepng($im);
 
             // to save to file:
             $success = ImagePng($im, $filepath . $filename);

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