mambax7 / smartobject

include/captcha/config.php

Spacing +13 added lines, -13 removed lines

@@ -14,27 +14,27 @@
 $config = array(
 	"mode"				=> 'image',
 	"name"				=> 'xoopscaptcha',
-	"skipmember"		=> true,					// Skip CAPTCHA check for members
-	"maxattempt"		=> 100,  					// Maximum attempts for each session
+	"skipmember"		=> true, // Skip CAPTCHA check for members
+	"maxattempt"		=> 100, // Maximum attempts for each session
 
-	"num_chars"			=> 4,  						// Maximum characters
+	"num_chars"			=> 4, // Maximum characters
 
 // For image mode, based on DuGris' SecurityImage
-	"rootpath"			=> dirname(__FILE__),		// __Absolute__ Path to the root of fonts and backgrounds
-	"imagepath"			=> "uploads/captcha",		// Path to temporary image files, __relative__ to XOOPS_ROOT_PATH
-	"imageurl"			=> "modules/smartobject/include/captcha/scripts/img.php",		// Path to the script for creating image, __relative__ to XOOPS_ROOT_PATH
-	"casesensitive"		=> false,					// Characters in image mode is case-sensitive
-	"fontsize_min"		=> 12,  					// Minimum font-size
-	"fontsize_max"		=> 12,  					// Maximum font-size
-	"background_type"	=> 0, 						// Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
-	"background_num"	=> 50,						// Number of background images to generate
+	"rootpath"			=> dirname(__FILE__), // __Absolute__ Path to the root of fonts and backgrounds
+	"imagepath"			=> "uploads/captcha", // Path to temporary image files, __relative__ to XOOPS_ROOT_PATH
+	"imageurl"			=> "modules/smartobject/include/captcha/scripts/img.php", // Path to the script for creating image, __relative__ to XOOPS_ROOT_PATH
+	"casesensitive"		=> false, // Characters in image mode is case-sensitive
+	"fontsize_min"		=> 12, // Minimum font-size
+	"fontsize_max"		=> 12, // Maximum font-size
+	"background_type"	=> 0, // Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
+	"background_num"	=> 50, // Number of background images to generate
 	"polygon_point"		=> 3,
 );
 
 $language = preg_replace("/[^a-z0-9_\-]/i", "", $GLOBALS["xoopsConfig"]["language"]);
 
-if(! @include_once dirname(__FILE__)."/language/{$language}.php") {
-    require_once dirname(__FILE__)."/language/english.php";
+if (!@include_once dirname(__FILE__) . "/language/{$language}.php") {
+    require_once dirname(__FILE__) . "/language/english.php";
 }
 
 return $config;

sendlink.php

Spacing +9 added lines, -9 removed lines

@@ -8,12 +8,12 @@ 
  */
 
 include_once("header.php");
-require_once SMARTOBJECT_ROOT_PATH.'class/smartloader.php';
-require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectlink.php';
-require_once XOOPS_ROOT_PATH.'/class/template.php';
+require_once SMARTOBJECT_ROOT_PATH . 'class/smartloader.php';
+require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectlink.php';
+require_once XOOPS_ROOT_PATH . '/class/template.php';
 
 $xoopsTpl = new XoopsTpl();
-$myts =& MyTextSanitizer::getInstance();
+$myts = & MyTextSanitizer::getInstance();
 $xoopsConfig['sitename'] = $myts->displayTarea($xoopsConfig['sitename']);
 
 xoops_header(false);
@@ -28,7 +28,7 @@ 
 switch ($op) {
     case 'sendlink' :
 
-        include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjectcontroller.php";
+        include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartobjectcontroller.php";
         $controller = new SmartObjectController($smartobject_link_handler);
 
         $linkObj = $controller->storeSmartObject();
@@ -38,15 +38,15 @@ 
              */
         }
 
-        $xoopsMailer =& getMailer();
+        $xoopsMailer = & getMailer();
         $xoopsMailer->useMail();
-        $xoopsMailer->setTemplateDir('language/'.$xoopsConfig['language'].'/mail_template');
+        $xoopsMailer->setTemplateDir('language/' . $xoopsConfig['language'] . '/mail_template');
 
         $xoopsMailer->setTemplate('sendlink.tpl');
         $xoopsMailer->assign('X_SITENAME', $xoopsConfig['sitename']);
         $xoopsMailer->assign('TO_NAME', $linkObj->getVar('to_name'));
         $xoopsMailer->assign('FROM_NAME', $linkObj->getVar('from_name'));
-        $xoopsMailer->assign('SITEURL', XOOPS_URL."/");
+        $xoopsMailer->assign('SITEURL', XOOPS_URL . "/");
         $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
         $xoopsMailer->assign('MESSAGE', $_POST['body']);
         $xoopsMailer->setToEmails($linkObj->getVar('to_email'));
@@ -96,7 +96,7 @@ 
         $linkObj->setVar('date', time());
         $linkObj->hideFieldFromForm(array('from_uid', 'to_uid', 'link', 'mid', 'mid_name'));
 
-        $form = $linkObj->getForm(_CO_SOBJECT_SEND_LINK_FORM, 'sendlink', false, _SEND,'javascript:window.close();');
+        $form = $linkObj->getForm(_CO_SOBJECT_SEND_LINK_FORM, 'sendlink', false, _SEND, 'javascript:window.close();');
 
         $form->assign($xoopsTpl);
 

language/english/common.php

Spacing +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
 define('_CO_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION2', "Vertical with icons");
 define('_CO_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION3', "Vertical no icon");
 define('_CO_SOBJECT_CURRENT_FILE', "Current file: ");
-define('_CO_SOBJECT_URL_FILE_DSC', "Alternatively, you can use an URL. If you select a file via 'Browse' button, URL will be ignored. You can use the tag {XOOPS_URL} to print ".XOOPS_URL);
+define('_CO_SOBJECT_URL_FILE_DSC', "Alternatively, you can use an URL. If you select a file via 'Browse' button, URL will be ignored. You can use the tag {XOOPS_URL} to print " . XOOPS_URL);
 define('_CO_SOBJECT_URL_FILE', "URL: ");
 define('_CO_SOBJECT_UPLOAD', "Select a file to upload: ");
 

header.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  */
 
 include_once "../../mainfile.php";
-include_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
+include_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 
 smart_loadCommonLanguageFile();
 

class/smartobjecttable.php

Spacing +44 added lines, -44 removed lines

@@ -32,7 +32,7 @@ 
     var $_sortable;
     var $_customCaption;
 
-    function SmartObjectColumn($keyname, $align='left', $width=false, $customMethodForValue=false, $param = false, $customCaption = false, $sortable = true) {
+    function SmartObjectColumn($keyname, $align = 'left', $width = false, $customMethodForValue = false, $param = false, $customCaption = false, $sortable = true) {
         $this->_keyname = $keyname;
         $this->_align = $align;
         $this->_width = $width;
@@ -85,7 +85,7 @@ 
     var $_columns;
     var $_criteria;
     var $_actions;
-    var $_objects=false;
+    var $_objects = false;
     var $_aObjects;
     var $_custom_actions;
     var $_sortsel;
@@ -100,14 +100,14 @@ 
     var $_tempObject;
     var $_tpl;
     var $_introButtons;
-    var $_quickSearch=false;
-    var $_actionButtons=false;
-    var $_head_css_class='bg3';
-    var $_hasActions=false;
-    var $_userSide=false;
-    var $_printerFriendlyPage=false;
-    var $_tableHeader=false;
-    var $_tableFooter=false;
+    var $_quickSearch = false;
+    var $_actionButtons = false;
+    var $_head_css_class = 'bg3';
+    var $_hasActions = false;
+    var $_userSide = false;
+    var $_printerFriendlyPage = false;
+    var $_tableHeader = false;
+    var $_tableFooter = false;
     var $_showActionsColumnTitle = true;
     var $_isTree = false;
     var $_showFilterAndLimit = true;
@@ -125,7 +125,7 @@ 
      *
      * @return array
      */
-    function SmartObjectTable(&$objectHandler, $criteria=false, $actions=array('edit', 'delete'), $userSide=false)
+    function SmartObjectTable(&$objectHandler, $criteria = false, $actions = array('edit', 'delete'), $userSide = false)
     {
         $this->_id = $objectHandler->className;
         $this->_objectHandler = $objectHandler;
@@ -142,7 +142,7 @@ 
         }
     }
 
-    function addActionButton($op, $caption=false, $text=false) {
+    function addActionButton($op, $caption = false, $text = false) {
         $action = array(
             'op' => $op,
             'caption' => $caption,
@@ -170,7 +170,7 @@ 
         $this->_printerFriendlyPage = $current_url . '&print';
     }
 
-    function addQuickSearch($fields, $caption=_CO_SOBJECT_QUICK_SEARCH) {
+    function addQuickSearch($fields, $caption = _CO_SOBJECT_QUICK_SEARCH) {
         $this->_quickSearch = array('fields' => $fields, 'caption' => $caption);
     }
 
@@ -213,7 +213,7 @@ 
             return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
         }
     }
-    function addWithSelectedActions($actions = array()){
+    function addWithSelectedActions($actions = array()) {
         $this->addColumn(new SmartObjectColumn('checked', 'center', 20, false, false, ' '));
         $this->_withSelectedActions = $actions;
     }
@@ -224,7 +224,7 @@ 
      * @param string $key key to the field that will be used for sorting
      * @param string $method method of the handler that will be called to populate the options when this filter is selected
      */
-    function addFilter($key, $method, $default=false) {
+    function addFilter($key, $method, $default = false) {
         $this->_filterseloptions[$key] = $method;
         $this->_filtersel2optionsDefault = $default;
     }
@@ -278,7 +278,7 @@ 
 
                 $aObject = array();
 
-                $i=0;
+                $i = 0;
 
                 $aColumns = array();
 
@@ -286,23 +286,23 @@ 
 
                     $aColumn = array();
 
-                    if ($i==0) {
+                    if ($i == 0) {
                         $class = "head";
                     } elseif ($i % 2 == 0) {
                         $class = "even";
                     } else {
                         $class = "odd";
                     }
-                    if(method_exists($object, 'initiateCustomFields')){
+                    if (method_exists($object, 'initiateCustomFields')) {
                         //$object->initiateCustomFields();
                     }
-                    if($column->_keyname == 'checked'){
-                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="'.$object->id().'" />';
+                    if ($column->_keyname == 'checked') {
+                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="' . $object->id() . '" />';
                     }elseif ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
                         $method = $column->_customMethodForValue;
-                        if($column->_param){
+                        if ($column->_param) {
                             $value = $object->$method($column->_param);
-                        }else{
+                        } else {
                             $value = $object->$method();
                         }
                     } else {
@@ -366,8 +366,8 @@ 
         $this->_hasActions = $doWeHaveActions;
     }
 
-    function fetchObjects($debug=false) {
-        return $this->_objectHandler->getObjects($this->_criteria, true,true, false, $debug);
+    function fetchObjects($debug = false) {
+        return $this->_objectHandler->getObjects($this->_criteria, true, true, false, $debug);
     }
 
     function getDefaultFilter() {
@@ -387,7 +387,7 @@ 
         unset($field);
 
         if ($this->_filterseloptions) {
-            foreach($this->_filterseloptions as $key=>$value) {
+            foreach ($this->_filterseloptions as $key=>$value) {
                 $field = array();
                 if (is_array($value)) {
                     $field['caption'] = $key;
@@ -420,7 +420,7 @@ 
     function getFilters2Array() {
         $ret = array();
 
-        foreach($this->_filtersel2options as $key=>$value) {
+        foreach ($this->_filtersel2options as $key=>$value) {
             $field = array();
             $field['caption'] = $value;
             $field['selected'] = $this->_filtersel2 == $key ? "selected='selected'" : '';
@@ -439,7 +439,7 @@ 
          * What was $params_of_the_options_sel doing again ?
          */
         //$this->_tpl->assign('smartobject_optionssel_action', $_SERVER['PHP_SELF'] . "?" . implode('&', $params_of_the_options_sel));
-        $this->_tpl->assign('smartobject_optionssel_action', $current_url );
+        $this->_tpl->assign('smartobject_optionssel_action', $current_url);
         $this->_tpl->assign('smartobject_optionssel_limitsArray', $limitsArray);
     }
 
@@ -505,7 +505,7 @@ 
 
     }
 
-    function render($fetchOnly=false, $debug=false)
+    function render($fetchOnly = false, $debug = false)
     {
         include_once XOOPS_ROOT_PATH . '/class/template.php';
 
@@ -516,7 +516,7 @@ 
          * Since we may not have a SmartObject to look into now, let's create one for this purpose
          * and we will free it after
          */
-        $this->_tempObject =& $this->_objectHandler->create();
+        $this->_tempObject = & $this->_objectHandler->create();
 
         $this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? intval($_GET['start' . $this->_objectHandler->keyName]) : 0);
 
@@ -573,7 +573,7 @@ 
         if (isset($_POST['quicksearch_' . $this->_id]) && $_POST['quicksearch_' . $this->_id] != '') {
             $quicksearch_criteria = new CriteriaCompo();
             if (is_array($this->_quickSearch['fields'])) {
-                foreach($this->_quickSearch['fields'] as $v) {
+                foreach ($this->_quickSearch['fields'] as $v) {
                     $quicksearch_criteria->add(new Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
                 }
             } else {
@@ -626,11 +626,11 @@ 
         $current_url = $current_urls['full_phpself'];
         $query_string = $current_urls['querystring'];
         if ($query_string) {
-            $query_string = str_replace('?', '',$query_string);
+            $query_string = str_replace('?', '', $query_string);
         }
         $query_stringArray = explode('&', $query_string);
         $new_query_stringArray = array();
-        foreach($query_stringArray as $query_string) {
+        foreach ($query_stringArray as $query_string) {
             if (strpos($query_string, 'sortsel') == FALSE && strpos($query_string, 'ordersel') == FALSE) {
                 $new_query_stringArray[] = $query_string;
             }
@@ -651,12 +651,12 @@ 
             $aColumn['width'] = $column->getWidth();
             $aColumn['align'] = $column->getAlign();
             $aColumn['key'] = $column->getKeyName();
-            if($column->_keyname == 'checked'){
+            if ($column->_keyname == 'checked') {
                 $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' .
-                        ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_'.$this->_id.', \'selected_smartobjects\');" />';
-            }elseif($column->getCustomCaption()){
+                        ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_' . $this->_id . ', \'selected_smartobjects\');" />';
+            }elseif ($column->getCustomCaption()) {
                 $aColumn['caption'] = $column->getCustomCaption();
-            }else{
+            } else {
                 $aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
             }
             // Are we doing a GET sort on this column ?
@@ -664,14 +664,14 @@ 
             $order = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
 
             if (isset($_REQUEST['quicksearch_' . $this->_id]) && $_REQUEST['quicksearch_' . $this->_id] != '') {
-                $qs_param = "&quicksearch_".$this->_id."=".$_REQUEST['quicksearch_' . $this->_id];
+                $qs_param = "&quicksearch_" . $this->_id . "=" . $_REQUEST['quicksearch_' . $this->_id];
             }
             if (!$this->_enableColumnsSorting || $column->_keyname == 'checked' || !$column->isSortable()) {
-                $aColumn['caption'] =  $aColumn['caption'];
+                $aColumn['caption'] = $aColumn['caption'];
             } elseif ($getSort) {
-                $aColumn['caption'] =  '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=' . $orderArray[$order]['neworder'].$qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . ' <img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . $orderArray[$order]['image'] . '" alt="ASC" /></a>';
+                $aColumn['caption'] = '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=' . $orderArray[$order]['neworder'] . $qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . ' <img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . $orderArray[$order]['image'] . '" alt="ASC" /></a>';
             } else {
-                $aColumn['caption'] =  '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC'.$qs_param.'&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
+                $aColumn['caption'] = '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC' . $qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
             }
             $aColumns[] = $aColumn;
         }
@@ -695,22 +695,22 @@ 
         $this->_tpl->assign('smartobject_actionButtons', $this->_actionButtons);
         $this->_tpl->assign('smartobject_introButtons', $this->_introButtons);
         $this->_tpl->assign('smartobject_id', $this->_id);
-        if(!empty($this->_withSelectedActions)){
+        if (!empty($this->_withSelectedActions)) {
             $this->_tpl->assign('smartobject_withSelectedActions', $this->_withSelectedActions);
         }
 
         $smartobject_table_template = $this->_customTemplate ? $this->_customTemplate : 'smartobject_smarttable_display.html';
         if ($fetchOnly) {
-            return $this->_tpl->fetch( 'db:' . $smartobject_table_template );
+            return $this->_tpl->fetch('db:' . $smartobject_table_template);
         } else {
-            $this->_tpl->display( 'db:' . $smartobject_table_template );
+            $this->_tpl->display('db:' . $smartobject_table_template);
         }
     }
 
     function disableColumnsSorting() {
         $this->_enableColumnsSorting = false;
     }
-    function fetch($debug=false) {
+    function fetch($debug = false) {
         return $this->render(true, $debug);
     }
 }

class/smartobjectlink.php

Spacing +8 added lines, -8 removed lines

@@ -30,12 +30,12 @@ 
 if (!defined("XOOPS_ROOT_PATH")) {
     die("XOOPS root path not defined");
 }
-include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobject.php";
+include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartobject.php";
 class SmartobjectLink extends SmartObject {
 
     function SmartobjectLink() {
         $this->initVar('linkid', XOBJ_DTYPE_INT, '', true);
-        $this->initVar('date', XOBJ_DTYPE_INT, 0, false, null,'', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
+        $this->initVar('date', XOBJ_DTYPE_INT, 0, false, null, '', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
         $this->initVar('from_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_FROM_UID, _CO_SOBJECT_LINK_FROM_UID_DSC);
         $this->initVar('from_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_EMAIL, _CO_SOBJECT_LINK_FROM_EMAIL_DSC, true);
         $this->initVar('from_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_NAME, _CO_SOBJECT_LINK_FROM_NAME_DSC, true);
@@ -60,7 +60,7 @@ 
     */
     function getVar($key, $format = 's') {
         if ($format == 's' && in_array($key, array('from_uid', 'to_uid', 'date', 'link'))) {
-            return call_user_func(array($this,$key));
+            return call_user_func(array($this, $key));
         }
         return parent::getVar($key, $format);
     }
@@ -70,24 +70,24 @@ 
         return $ret;
     }
 
-    function to_uid($withContact=false) {
+    function to_uid($withContact = false) {
   	    $ret = smart_getLinkedUnameFromId($this->getVar('to_uid', 'e'), 1, null, true);
         return $ret;
     }
 
     function date() {
-        $ret = formatTimestamp($this->getVar('date','e'));
+        $ret = formatTimestamp($this->getVar('date', 'e'));
         return $ret;
     }
 
-    function link($full=false) {
-        $ret = $this->getVar('link','e');
+    function link($full = false) {
+        $ret = $this->getVar('link', 'e');
         if ($full) {
         	$myts = MyTextSanitizer::getInstance();
         	$ret = $myts->displayTarea($ret);
         	return $ret;
         } else {
-        	$ret = '<a href="' . $ret . '" alt="' . $this->getVar('link','e') . '" title="' . $this->getVar('link','e') . '">' .  _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
+        	$ret = '<a href="' . $ret . '" alt="' . $this->getVar('link', 'e') . '" title="' . $this->getVar('link', 'e') . '">' . _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
         	return $ret;
         }
     }

class/smarthighlighter.php

Spacing +11 added lines, -11 removed lines

@@ -62,7 +62,7 @@ 
      * </code>
      */
     // public function __construct ()
-    function SmartHighlighter ($keywords, $singlewords = false, $replace_callback = null ) {
+    function SmartHighlighter($keywords, $singlewords = false, $replace_callback = null) {
         $this->keywords = $keywords;
         $this->singlewords = $singlewords;
         $this->replace_callback = $replace_callback;
@@ -71,11 +71,11 @@ 
     /**
      * @access private
      */
-    function replace ($replace_matches) {
+    function replace($replace_matches) {
 
-        $patterns = array ();
+        $patterns = array();
         if ($this->singlewords) {
-            $keywords = explode (' ', $this->preg_keywords);
+            $keywords = explode(' ', $this->preg_keywords);
             foreach ($keywords as $keyword) {
                 $patterns[] = '/(?' . '>' . $keyword . '+)/si';
             }
@@ -86,10 +86,10 @@ 
         $result = $replace_matches[0];
 
         foreach ($patterns as $pattern) {
-            if (!is_null ($this->replace_callback)) {
-                $result = preg_replace_callback ($pattern, $this->replace_callback, $result);
+            if (!is_null($this->replace_callback)) {
+                $result = preg_replace_callback($pattern, $this->replace_callback, $result);
             } else {
-                $result = preg_replace ($pattern, '<span class="highlightedkey">\\0</span>', $result);
+                $result = preg_replace($pattern, '<span class="highlightedkey">\\0</span>', $result);
             }
         }
 
@@ -99,11 +99,11 @@ 
     /**
      * @access private
      */
-    function highlight ($buffer) {
+    function highlight($buffer) {
         $buffer = '>' . $buffer . '<';
-        $this->preg_keywords = preg_replace ('/[^\w ]/si', '', $this->keywords);
-        $buffer = preg_replace_callback ("/(\>(((?" . ">[^><]+)|(?R))*)\<)/is", array (&$this, 'replace'), $buffer);
-        $buffer = substr ($buffer, 1, -1);
+        $this->preg_keywords = preg_replace('/[^\w ]/si', '', $this->keywords);
+        $buffer = preg_replace_callback("/(\>(((?" . ">[^><]+)|(?R))*)\<)/is", array(&$this, 'replace'), $buffer);
+        $buffer = substr($buffer, 1, -1);
         return $buffer;
     }
 }

class/smartobjecttreetable.php

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
  */
 class SmartObjectTreeTable extends SmartObjectTable {
 
-    function SmartObjectTreeTable(&$objectHandler, $criteria=false, $actions=array('edit', 'delete'), $userSide=false)
+    function SmartObjectTreeTable(&$objectHandler, $criteria = false, $actions = array('edit', 'delete'), $userSide = false)
     {
         $this->SmartObjectTable($objectHandler, $criteria, $actions, $userSide);
         $this->_isTree = true;
@@ -34,15 +34,15 @@ 
      * @var int $parentid id of the parent which children we want to retreive
      * @return array of SmartObject
      */
-    function getChildrenOf($parentid=0) {
+    function getChildrenOf($parentid = 0) {
         return isset($this->_objects[$parentid]) ? $this->_objects[$parentid] : false;
     }
 
-    function createTableRow($object, $level=0) {
+    function createTableRow($object, $level = 0) {
 
         $aObject = array();
 
-        $i=0;
+        $i = 0;
 
         $aColumns = array();
         $doWeHaveActions = false;
@@ -51,7 +51,7 @@ 
 
             $aColumn = array();
 
-            if ($i==0) {
+            if ($i == 0) {
                 $class = "head";
             } elseif ($i % 2 == 0) {
                 $class = "even";
@@ -74,7 +74,7 @@ 
             }
 
             $space = '';
-            if($column->getKeyName() == $this->_objectHandler->identifierName){
+            if ($column->getKeyName() == $this->_objectHandler->identifierName) {
                 for ($i = 0; $i < $level; $i++) {
                     $space = $space . '--';
                 }
@@ -125,7 +125,7 @@ 
 
         $childrenObjects = $this->getChildrenOf($object->id());
 
-        $this->_hasActions =$this->_hasActions  ? true : count($actions) > 0;
+        $this->_hasActions = $this->_hasActions ? true : count($actions) > 0;
 
         if ($childrenObjects) {
             $level++;

class/smartobjectpermission.php

Spacing +18 added lines, -18 removed lines

@@ -15,7 +15,7 @@ 
 {
     var $handler;
     function SmartObjectPermissionHandler($handler) {
-        $this->handler=$handler;
+        $this->handler = $handler;
     }
 
     /*
@@ -30,9 +30,9 @@ 
         static $groups;
 
         if (!isset($groups[$gperm_name]) || ($id != null && !isset($groups[$gperm_name][$id]))) {
-            $smartModule =& $this->handler->getModuleInfo();
+            $smartModule = & $this->handler->getModuleInfo();
             //Get group permissions handler
-            $gperm_handler =& xoops_gethandler('groupperm');
+            $gperm_handler = & xoops_gethandler('groupperm');
 
             //Get groups allowed for an item id
             $allowedgroups = $gperm_handler->getGroupIds($gperm_name, $id, $smartModule->getVar('mid'));
@@ -42,11 +42,11 @@ 
         return isset($groups[$gperm_name][$id]) ? $groups[$gperm_name][$id] : array();
     }
 
-    function getGrantedGroupsForIds($item_ids_array, $gperm_name=false) {
+    function getGrantedGroupsForIds($item_ids_array, $gperm_name = false) {
 
         static $groups;
 
-        if ($gperm_name){
+        if ($gperm_name) {
             if (isset($groups[$gperm_name])) {
                 return $groups[$gperm_name];
             }
@@ -55,7 +55,7 @@ 
             return $groups;
         }
 
-        $smartModule =& $this->handler->getModuleInfo();
+        $smartModule = & $this->handler->getModuleInfo();
 
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('gperm_modid', $smartModule->getVar('mid')));
@@ -65,7 +65,7 @@ 
         }
 
         //Get group permissions handler
-        $gperm_handler =& xoops_gethandler('groupperm');
+        $gperm_handler = & xoops_gethandler('groupperm');
 
         $permissionsObj = $gperm_handler->getObjects($criteria);
 
@@ -95,18 +95,18 @@ 
 
         if (!isset($permissions[$gperm_name]) || ($id != null && !isset($permissions[$gperm_name][$id]))) {
 
-            $smartModule =& $this->handler->getModuleInfo();
+            $smartModule = & $this->handler->getModuleInfo();
 
             if (is_object($smartModule)) {
 
                 //Get group permissions handler
-                $gperm_handler =& xoops_gethandler('groupperm');
+                $gperm_handler = & xoops_gethandler('groupperm');
 
                 //Get user's groups
                 $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
 
                 //Get all allowed item ids in this module and for this user's groups
-                $userpermissions =& $gperm_handler->getItemIds($gperm_name, $groups, $smartModule->getVar('mid'));
+                $userpermissions = & $gperm_handler->getItemIds($gperm_name, $groups, $smartModule->getVar('mid'));
                 $permissions[$gperm_name] = $userpermissions;
             }
         }
@@ -133,11 +133,11 @@ 
 
     function saveItem_Permissions($groups, $itemid, $perm_name)
     {
-        $smartModule =& $this->handler->getModuleInfo();
+        $smartModule = & $this->handler->getModuleInfo();
 
         $result = true;
         $module_id = $smartModule->getVar('mid');
-        $gperm_handler =& xoops_gethandler('groupperm');
+        $gperm_handler = & xoops_gethandler('groupperm');
 
         // First, if the permissions are already there, delete them
         $gperm_handler->deleteByModule($module_id, $perm_name, $itemid);
@@ -165,11 +165,11 @@ 
     {
         global $xoopsModule;
 
-        $smartModule =& smartsection_getModuleInfo();
+        $smartModule = & smartsection_getModuleInfo();
 
         $result = true;
-        $module_id = $smartModule->getVar('mid')   ;
-        $gperm_handler =& xoops_gethandler('groupperm');
+        $module_id = $smartModule->getVar('mid');
+        $gperm_handler = & xoops_gethandler('groupperm');
 
 
         $gperm_handler->deleteByModule($module_id, $gperm_name, $itemid);
@@ -188,11 +188,11 @@ 
         global $xoopsUser;
 
         $gperm_groupid = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
-        $smartModule =& $this->handler->getModuleInfo();
-        $gperm_modid = $smartModule->getVar('mid')   ;
+        $smartModule = & $this->handler->getModuleInfo();
+        $gperm_modid = $smartModule->getVar('mid');
 
         //Get group permissions handler
-        $gperm_handler =& xoops_gethandler('groupperm');
+        $gperm_handler = & xoops_gethandler('groupperm');
 
         return $gperm_handler->checkRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid);
     }