Completed
Branch master (0b66f1)
by Michael
33:21
created
htdocs/modules/images/preloads/preload.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     {
26 26
         $path = dirname(__DIR__);
27 27
         XoopsLoad::addMap(array(
28
-            'images' => $path . '/class/helper.php',
28
+            'images' => $path.'/class/helper.php',
29 29
         ));
30 30
     }
31 31
 
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
     {
34 34
         /* @var $dhtml Xoops\Form\DhtmlTextArea */
35 35
         $dhtml = $args[1];
36
-        $args[0] .= "<img src='" . \XoopsBaseConfig::get('url') . "/images/image.gif' alt='" . XoopsLocale::INSIDE_IMAGE . "' title='" . XoopsLocale::INSIDE_IMAGE . "' onclick='openWithSelfMain(\"" . \XoopsBaseConfig::get('url') . "/modules/images/imagemanager.php?target={$dhtml->getName()}\",\"imgmanager\",400,430);'  onmouseover='style.cursor=\"hand\"'/>&nbsp;";
36
+        $args[0] .= "<img src='".\XoopsBaseConfig::get('url')."/images/image.gif' alt='".XoopsLocale::INSIDE_IMAGE."' title='".XoopsLocale::INSIDE_IMAGE."' onclick='openWithSelfMain(\"".\XoopsBaseConfig::get('url')."/modules/images/imagemanager.php?target={$dhtml->getName()}\",\"imgmanager\",400,430);'  onmouseover='style.cursor=\"hand\"'/>&nbsp;";
37 37
     }
38 38
 
39 39
     public static function eventCoreImage($args)
40 40
     {
41 41
         $uri = '';
42 42
         foreach (Request::get() as $k => $v) {
43
-            $uri .=  urlencode($k) . '=' . urlencode($v) . '&';
43
+            $uri .= urlencode($k).'='.urlencode($v).'&';
44 44
         }
45 45
         Xoops::getInstance()->redirect("modules/images/image.php?{$uri}", 0);
46 46
     }
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     {
50 50
         $uri = '';
51 51
         foreach (Request::get() as $k => $v) {
52
-            $uri .=  urlencode($k) . '=' . urlencode($v) . '&';
52
+            $uri .= urlencode($k).'='.urlencode($v).'&';
53 53
         }
54 54
         Xoops::getInstance()->redirect("modules/images/imagemanager.php?{$uri}", 0);
55 55
     }
Please login to merge, or discard this patch.
htdocs/modules/images/language/english/admin.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -19,46 +19,46 @@
 block discarded – undo
19 19
  * @version         $Id$
20 20
  */
21 21
 //index.php
22
-define("_AM_IMAGES_NBCAT","There are <span class='red bold'>%s</span> categories in our database");
23
-define("_AM_IMAGES_NBIMAGES","There are <span class='red bold'>%s</span> images in our database");
22
+define("_AM_IMAGES_NBCAT", "There are <span class='red bold'>%s</span> categories in our database");
23
+define("_AM_IMAGES_NBIMAGES", "There are <span class='red bold'>%s</span> images in our database");
24 24
 
25 25
 // Common
26
-define("_AM_IMAGES_ACTIONS","Actions");
27
-define("_AM_IMAGES_NAME","Name");
28
-define("_AM_IMAGES_DISPLAY","Display");
29
-define("_AM_IMAGES_WEIGHT","Display order in image manager:");
30
-define("_AM_IMAGES_VIEW","View");
26
+define("_AM_IMAGES_ACTIONS", "Actions");
27
+define("_AM_IMAGES_NAME", "Name");
28
+define("_AM_IMAGES_DISPLAY", "Display");
29
+define("_AM_IMAGES_WEIGHT", "Display order in image manager:");
30
+define("_AM_IMAGES_VIEW", "View");
31 31
 
32 32
 // Categories.php
33 33
 define("_AM_IMAGES_CAT_ADD", "Add a new category");
34
-define("_AM_IMAGES_CAT_EDIT","Edit Category");
34
+define("_AM_IMAGES_CAT_EDIT", "Edit Category");
35 35
 define("_AM_IMAGES_CAT_SAVE", "Category saved");
36 36
 define("_AM_IMAGES_CAT_NOTSAVE", "Category not saved");
37 37
 define("_AM_IMAGES_CAT_DELETE", "Are you sure to delete the category : <span class='bold red'>%s</span><br />and all of its images files?");
38 38
 define("_AM_IMAGES_CAT_SELECT", "Select category");
39
-define("_AM_IMAGES_CAT_NBIMAGES","Images");
40
-define("_AM_IMAGES_CAT_MAXSIZE","Max size");
41
-define("_AM_IMAGES_CAT_MAXWIDTH","Max width");
42
-define("_AM_IMAGES_CAT_MAXHEIGHT","Max height");
43
-define("_AM_IMAGES_CAT_OFF","Display in image manager");
44
-define("_AM_IMAGES_CAT_ON","Does not display in image manager");
45
-define("_AM_IMAGES_CAT_INDB",' Store in the database (as binary "blob" data)');
46
-define("_AM_IMAGES_CAT_ASFILE"," Store as files (in uploads directory)<br />");
47
-define("_AM_IMAGES_CAT_NAME","Category Name:");
48
-define("_AM_IMAGES_CAT_READ_GRP",'Select groups for image manager use:<br /><br /><span style="font-weight: normal;">These are groups allowed to use the image manager for selecting images but not uploading. Webmaster has automatic access.</span>');
49
-define("_AM_IMAGES_CAT_WRITE_GRP",'Select groups allowed to upload images:<br /><br /><span style="font-weight: normal;">Typical usage is for moderator and admin groups.</span>');
50
-define("_AM_IMAGES_CAT_DISPLAY","Display this category ?");
51
-define("_AM_IMAGES_CAT_STR_TYPE","Images are uploaded to:");
52
-define("_AM_IMAGES_CAT_STR_TYOPENG","This can not be changed afterwards!");
39
+define("_AM_IMAGES_CAT_NBIMAGES", "Images");
40
+define("_AM_IMAGES_CAT_MAXSIZE", "Max size");
41
+define("_AM_IMAGES_CAT_MAXWIDTH", "Max width");
42
+define("_AM_IMAGES_CAT_MAXHEIGHT", "Max height");
43
+define("_AM_IMAGES_CAT_OFF", "Display in image manager");
44
+define("_AM_IMAGES_CAT_ON", "Does not display in image manager");
45
+define("_AM_IMAGES_CAT_INDB", ' Store in the database (as binary "blob" data)');
46
+define("_AM_IMAGES_CAT_ASFILE", " Store as files (in uploads directory)<br />");
47
+define("_AM_IMAGES_CAT_NAME", "Category Name:");
48
+define("_AM_IMAGES_CAT_READ_GRP", 'Select groups for image manager use:<br /><br /><span style="font-weight: normal;">These are groups allowed to use the image manager for selecting images but not uploading. Webmaster has automatic access.</span>');
49
+define("_AM_IMAGES_CAT_WRITE_GRP", 'Select groups allowed to upload images:<br /><br /><span style="font-weight: normal;">Typical usage is for moderator and admin groups.</span>');
50
+define("_AM_IMAGES_CAT_DISPLAY", "Display this category ?");
51
+define("_AM_IMAGES_CAT_STR_TYPE", "Images are uploaded to:");
52
+define("_AM_IMAGES_CAT_STR_TYOPENG", "This can not be changed afterwards!");
53 53
 
54
-define('_AM_IMAGES_CAT_SIZE','Max size allowed (bytes):');
55
-define('_AM_IMAGES_CAT_WIDTH','Max width allowed (pixels):');
56
-define('_AM_IMAGES_CAT_HEIGHT','Max height allowed (pixels):');
54
+define('_AM_IMAGES_CAT_SIZE', 'Max size allowed (bytes):');
55
+define('_AM_IMAGES_CAT_WIDTH', 'Max width allowed (pixels):');
56
+define('_AM_IMAGES_CAT_HEIGHT', 'Max height allowed (pixels):');
57 57
 
58 58
 // images.php
59 59
 define("_AM_IMAGES_IMG_ADD", "Add a new images");
60
-define("_AM_IMAGES_IMG_EDIT","Edit Image");
60
+define("_AM_IMAGES_IMG_EDIT", "Edit Image");
61 61
 define("_AM_IMAGES_IMG_SAVE", "Image saved");
62
-define("_AM_IMAGES_IMG_DELETE","Are you sure to delete the image : <span class='bold red'>%s</span>?");
62
+define("_AM_IMAGES_IMG_DELETE", "Are you sure to delete the image : <span class='bold red'>%s</span>?");
63 63
 define("_AM_IMAGES_IMG_URL", "Image url");
64
-define('_AM_IMAGES_IMG_FILE','Image file:');
64
+define('_AM_IMAGES_IMG_FILE', 'Image file:');
Please login to merge, or discard this patch.
htdocs/modules/images/class/form/category_imagemanager.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,9 +38,9 @@
 block discarded – undo
38 38
         $select->addOption(0, _AM_IMAGES_CAT_SELECT);
39 39
         $select->addOptionArray($categories);
40 40
         if (isset($target)) {
41
-            $select->setExtra("onchange='javascript:window.location.href=\"" . $xoops->getEnv('PHP_SELF') . "?target=" . $target . "&imgcat_id=\" + this.value'");
41
+            $select->setExtra("onchange='javascript:window.location.href=\"".$xoops->getEnv('PHP_SELF')."?target=".$target."&imgcat_id=\" + this.value'");
42 42
         } else {
43
-            $select->setExtra("onchange='javascript:window.location.href=\"" . $xoops->getEnv('PHP_SELF') . "?imgcat_id=\" + this.value'");
43
+            $select->setExtra("onchange='javascript:window.location.href=\"".$xoops->getEnv('PHP_SELF')."?imgcat_id=\" + this.value'");
44 44
         }
45 45
         $this->addElement($select);
46 46
 
Please login to merge, or discard this patch.
htdocs/modules/images/class/form/image.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -50,15 +50,15 @@  discard block
 block discarded – undo
50 50
             $select->addOptionArray($categories);
51 51
             $tab1->addElement($select, true);
52 52
         } else {
53
-            $tab1->addElement(new Xoops\Form\Label(_AM_IMAGES_CAT_SELECT, '<span class="red bold">' . $helper->getHandlerCategories()->get($obj->getVar('imgcat_id'))->getVar('imgcat_name') . '</span>'));
53
+            $tab1->addElement(new Xoops\Form\Label(_AM_IMAGES_CAT_SELECT, '<span class="red bold">'.$helper->getHandlerCategories()->get($obj->getVar('imgcat_id'))->getVar('imgcat_name').'</span>'));
54 54
             $this->addElement(new Xoops\Form\Hidden('imgcat_id', $obj->getVar('imgcat_id')));
55 55
         }
56 56
 
57 57
         // warning
58 58
         $category = $helper->getHandlerCategories()->get($obj->getVar('imgcat_id'));
59
-        $upload_msg[] = _AM_IMAGES_CAT_SIZE . ' : ' . $category->getVar('imgcat_maxsize');
60
-        $upload_msg[] = _AM_IMAGES_CAT_WIDTH . ' : ' . $category->getVar('imgcat_maxwidth');
61
-        $upload_msg[] = _AM_IMAGES_CAT_HEIGHT . ' : ' . $category->getVar('imgcat_maxheight');
59
+        $upload_msg[] = _AM_IMAGES_CAT_SIZE.' : '.$category->getVar('imgcat_maxsize');
60
+        $upload_msg[] = _AM_IMAGES_CAT_WIDTH.' : '.$category->getVar('imgcat_maxwidth');
61
+        $upload_msg[] = _AM_IMAGES_CAT_HEIGHT.' : '.$category->getVar('imgcat_maxheight');
62 62
 
63 63
         $image_tray = new Xoops\Form\File(_AM_IMAGES_IMG_FILE, 'image_file');
64 64
         $image_tray->setDescription(self::message($upload_msg, ''));
@@ -101,9 +101,9 @@  discard block
 block discarded – undo
101 101
      */
102 102
     public function message($msg, $title = '', $class = 'errorMsg')
103 103
     {
104
-        $ret = "<div class='" . $class . "'>";
104
+        $ret = "<div class='".$class."'>";
105 105
         if ($title != '') {
106
-            $ret .= "<strong>" . $title . "</strong>";
106
+            $ret .= "<strong>".$title."</strong>";
107 107
         }
108 108
         if (is_array($msg) || is_object($msg)) {
109 109
             $ret .= implode('<br />', $msg);
Please login to merge, or discard this patch.
htdocs/modules/images/class/form/category.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
         $tab1->addElement(new Xoops\Form\Text(_AM_IMAGES_WEIGHT, 'imgcat_weight', 1, 5, $obj->getVar('imgcat_weight')));
53 53
         $tab1->addElement(new Xoops\Form\RadioYesNo(_AM_IMAGES_CAT_DISPLAY, 'imgcat_display', $obj->getVar('imgcat_display')));
54 54
         if ($obj->isNew()) {
55
-            $store = new Xoops\Form\Radio(_AM_IMAGES_CAT_STR_TYPE . '<div class="red">' . _AM_IMAGES_CAT_STR_TYOPENG . '</div>', 'imgcat_storetype', 'file');
55
+            $store = new Xoops\Form\Radio(_AM_IMAGES_CAT_STR_TYPE.'<div class="red">'._AM_IMAGES_CAT_STR_TYOPENG.'</div>', 'imgcat_storetype', 'file');
56 56
             $store->addOptionArray(array('file' => _AM_IMAGES_CAT_ASFILE, 'db' => _AM_IMAGES_CAT_INDB));
57 57
             $tab1->addElement($store);
58 58
         } else {
Please login to merge, or discard this patch.
htdocs/modules/comments/comment_delete.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,5 +18,5 @@
 block discarded – undo
18 18
  * @version         $Id$
19 19
  */
20 20
 
21
-include_once dirname(dirname(__DIR__)) . '/mainfile.php';
21
+include_once dirname(dirname(__DIR__)).'/mainfile.php';
22 22
 Comments::getInstance()->displayDelete();
Please login to merge, or discard this patch.
htdocs/modules/comments/comment_reply.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,6 +18,6 @@
 block discarded – undo
18 18
  * @version         $Id$
19 19
  */
20 20
 
21
-include_once dirname(dirname(__DIR__)) . '/mainfile.php';
21
+include_once dirname(dirname(__DIR__)).'/mainfile.php';
22 22
 Comments::getInstance()->displayReply();
23 23
 
Please login to merge, or discard this patch.
htdocs/modules/comments/comment_post.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,5 +18,5 @@
 block discarded – undo
18 18
  * @version         $Id$
19 19
  */
20 20
 
21
-include_once dirname(dirname(__DIR__)) . '/mainfile.php';
21
+include_once dirname(dirname(__DIR__)).'/mainfile.php';
22 22
 Comments::getInstance()->displayPost();
Please login to merge, or discard this patch.
htdocs/modules/comments/admin/comment_delete.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
  * @version         $Id$
18 18
  */
19 19
 
20
-include __DIR__ . '/header.php';
20
+include __DIR__.'/header.php';
21 21
 //there is no way to override current tabs when using system menu
22 22
 //this dirty hack will have to do it
23 23
 $_SERVER['REQUEST_URI'] = "admin/main.php";
Please login to merge, or discard this patch.