mambax7 / smartobject

include/functions.php

Spacing +40 added lines, -40 removed lines

@@ -155,7 +155,7 @@ 
     //Verifies that a MySQL table exists
     $xoopsDB = & XoopsDatabaseFactory::getDatabaseConnection();
     $realname = $xoopsDB->prefix($table);
-    $sql = "SHOW TABLES FROM ".XOOPS_DB_NAME;
+    $sql = "SHOW TABLES FROM " . XOOPS_DB_NAME;
     $ret = $xoopsDB->queryF($sql);
     while (list ($m_table) = $xoopsDB->fetchRow($ret)) {
         if ($m_table == $realname) {
@@ -237,7 +237,7 @@ 
     // truncate the original string to a length of $length
     // minus the position of the last space
     // plus the length of the $trimmarker
-    $truncated_string = xoops_substr($str, $start, $length - $position_of_space +strlen($trimmarker), $trimmarker);
+    $truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
     return $truncated_string;
 }
 function smart_getConfig($key, $moduleName = false, $default = 'default_is_undefined') {
@@ -339,7 +339,7 @@ 
         }
         $attr = " width='$width' height='$height'";
     }
-    return array (
+    return array(
     $width,
     $height,
     $type,
@@ -349,7 +349,7 @@ 
 function &smart_getModuleInfo($moduleName = false) {
     static $smartModules;
     if (isset ($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
+        $ret = & $smartModules[$moduleName];
         return $ret;
     }
     global $xoopsModule;
@@ -411,7 +411,7 @@ 
         return unlink($dirname);
     }
 }
-function smart_formatErrors($errors = array ()) {
+function smart_formatErrors($errors = array()) {
     $ret = '';
     foreach ($errors as $key => $value) {
         $ret .= "<br /> - " . $value;
@@ -425,13 +425,13 @@ 
  * @param integer $name :  0 Use Usenamer 1 Use realname
  * @return
  */
-function smart_getLinkedUnameFromId($userid = 0, $name = 0, $users = array (), $withContact = false) {
+function smart_getLinkedUnameFromId($userid = 0, $name = 0, $users = array(), $withContact = false) {
     if (!is_numeric($userid)) {
         return $userid;
     }
     $userid = intval($userid);
     if ($userid > 0) {
-        if ($users == array ()) {
+        if ($users == array()) {
             //fetching users
             $member_handler = & xoops_gethandler('member');
             $user = & $member_handler->getUser($userid);
@@ -482,7 +482,7 @@ 
     $adminmenu = array();
     include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
     $tpl = new XoopsTpl();
-    $tpl->assign(array (
+    $tpl->assign(array(
         'headermenu' => $headermenu,
         'adminmenu' => $adminmenu,
         'current' => $currentoption,
@@ -587,7 +587,7 @@ 
         $querystring = '?' . $querystring;
     }
     $currenturl = $http . $httphost . $phpself . $querystring;
-    $urls = array ();
+    $urls = array();
     $urls['http'] = $http;
     $urls['httphost'] = $httphost;
     $urls['phpself'] = $phpself;
@@ -714,7 +714,7 @@ 
         elseif (!empty ($height)) {
             $width = $dimension[0] * $height / $dimension[1];
         } else {
-            list ($width, $height) = array (
+            list ($width, $height) = array(
             $dimension[0],
             $dimension[1]
             );
@@ -742,7 +742,7 @@ 
         }
         $class = 'Xoops' . ucfirst($name) . 'Handler';
         if (class_exists($class)) {
-            $handlers[$name] = new $class ($GLOBALS['xoopsDB'], 'xoops');
+            $handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
         }
     }
     if (!isset ($handlers[$name]) && !$optional) {
@@ -755,7 +755,7 @@ 
 }
 function smart_sanitizeAdsenses_callback($matches) {
     global $smartobject_adsense_handler;
-    if (isset($smartobject_adsense_handler->objects[$matches[1]])){
+    if (isset($smartobject_adsense_handler->objects[$matches[1]])) {
         $adsenseObj = $smartobject_adsense_handler->objects[$matches[1]];
         $ret = $adsenseObj->render();
         return $ret;
@@ -765,8 +765,8 @@ 
 }
 function smart_sanitizeAdsenses($text) {
 
-    $patterns = array ();
-    $replacements = array ();
+    $patterns = array();
+    $replacements = array();
 
     $patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
     $text = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
@@ -774,7 +774,7 @@ 
 }
 function smart_sanitizeCustomtags_callback($matches) {
     global $smartobject_customtag_handler;
-    if (isset($smartobject_customtag_handler->objects[$matches[1]])){
+    if (isset($smartobject_customtag_handler->objects[$matches[1]])) {
         $customObj = $smartobject_customtag_handler->objects[$matches[1]];
         $ret = $customObj->renderWithPhp();
         return $ret;
@@ -783,8 +783,8 @@ 
     }
 }
 function smart_sanitizeCustomtags($text) {
-    $patterns = array ();
-    $replacements = array ();
+    $patterns = array();
+    $replacements = array();
 
     $patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
     $text = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
@@ -830,7 +830,7 @@ 
     $text = str_replace('\n', ' ', $text);
     $text = str_replace('&#8213;', ' ', $text);
 
-    if ($keyword){
+    if ($keyword) {
         $text = str_replace('.', ' ', $text);
         $text = str_replace(',', ' ', $text);
         $text = str_replace('\'', ' ', $text);
@@ -848,11 +848,11 @@ 
     // and white space. It will also convert some
     // common HTML entities to their text equivalent.
     // Credits : newbb2
-    $search = array ("'<script[^>]*?>.*?</script>'si",  // Strip out javascript
-	"'<img.*?/>'si",       // Strip out img tags
-	"'<[\/\!]*?[^<>]*?>'si",          // Strip out HTML tags
-	"'([\r\n])[\s]+'",                // Strip out white space
-	"'&(quot|#34);'i",                // Replace HTML entities
+    $search = array("'<script[^>]*?>.*?</script>'si", // Strip out javascript
+	"'<img.*?/>'si", // Strip out img tags
+	"'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
+	"'([\r\n])[\s]+'", // Strip out white space
+	"'&(quot|#34);'i", // Replace HTML entities
 	"'&(amp|#38);'i",
 	"'&(lt|#60);'i",
 	"'&(gt|#62);'i",
@@ -861,9 +861,9 @@ 
 	"'&(cent|#162);'i",
 	"'&(pound|#163);'i",
 	"'&(copy|#169);'i",
-	"'&#(\d+);'e");                    // evaluate as php
+	"'&#(\d+);'e"); // evaluate as php
 
-    $replace = array ("",
+    $replace = array("",
 	"",
 	"",
 	"\\1",
@@ -888,35 +888,35 @@ 
  * Use this snippet to extract any float out of a string. You can choose how a single dot is treated with the (bool) 'single_dot_as_decimal' directive.
  * This function should be able to cover almost all floats that appear in an european environment.
  */
-function smart_getfloat($str, $set=FALSE){
-    if(preg_match("/([0-9\.,-]+)/", $str, $match)) {
+function smart_getfloat($str, $set = FALSE) {
+    if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
         // Found number in $str, so set $str that number
         $str = $match[0];
-        if(strstr($str, ',')){
+        if (strstr($str, ',')) {
             // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-            $str = str_replace('.', '', $str);    // Erase thousand seps
-            $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+            $str = str_replace('.', '', $str); // Erase thousand seps
+            $str = str_replace(',', '.', $str); // Convert , to . for floatval command
             return floatval($str);
-        }else{
+        } else {
             // No comma exists, so we have to decide, how a single dot shall be treated
-            if(preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == TRUE && $set['single_dot_as_decimal'] == TRUE){
+            if (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == TRUE && $set['single_dot_as_decimal'] == TRUE) {
                 // Treat single dot as decimal separator
 
                 return floatval($str);
             } else {//echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br/><br/> ";
                 // Else, treat all dots as thousand seps
-                $str = str_replace('.', '', $str);    // Erase thousand seps
+                $str = str_replace('.', '', $str); // Erase thousand seps
                 return floatval($str);
             }
         }
-    }else{
+    } else {
         // No number found, return zero
         return 0;
     }
 }
 
-function smart_currency($var, $currencyObj=false) {
-    $ret = smart_getfloat($var,  array('single_dot_as_decimal'=> TRUE));
+function smart_currency($var, $currencyObj = false) {
+    $ret = smart_getfloat($var, array('single_dot_as_decimal'=> TRUE));
     $ret = round($ret, 2);
     // make sur we have at least .00 in the $var
     $decimal_section_original = strstr($ret, '.');
@@ -924,7 +924,7 @@ 
     if ($decimal_section) {
         if (strlen($decimal_section) == 1) {
             $decimal_section = '.00';
-        } elseif(strlen($decimal_section) == 2) {
+        } elseif (strlen($decimal_section) == 2) {
             $decimal_section = $decimal_section . '0';
         }
         $ret = str_replace($decimal_section_original, $decimal_section, $ret);
@@ -941,14 +941,14 @@ 
     return smart_currency($var);
 }
 
-function smart_getModuleAdminLink($moduleName=false) {
+function smart_getModuleAdminLink($moduleName = false) {
     global $xoopsModule;
     if (!$moduleName && (isset ($xoopsModule) && is_object($xoopsModule))) {
         $moduleName = $xoopsModule->getVar('dirname');
     }
     $ret = '';
     if ($moduleName) {
-        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" ._CO_SOBJECT_ADMIN_PAGE . "</a>";
+        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . "</a>";
     }
     return $ret;
 }
@@ -962,7 +962,7 @@ 
     $xoopseditor_handler = XoopsEditorHandler::getInstance();
     $aList = $xoopseditor_handler->getList();
     $ret = array();
-    foreach($aList as $k=>$v) {
+    foreach ($aList as $k=>$v) {
         $ret[$v] = $k;
     }
     return $ret;

include/adsense.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 function smart_adsense_initiate_smartytags() {
     global $xoopsTpl, $smartobject_adsense_handler;
     if (is_object($xoopsTpl)) {
-        foreach($smartobject_adsense_handler->objects as $k=>$v) {
+        foreach ($smartobject_adsense_handler->objects as $k=>$v) {
             $xoopsTpl->assign('adsense_' . $k, $v->render());
         }
     }
@@ -23,7 +23,7 @@ 
     include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
 }
 
-include_once XOOPS_ROOT_PATH."/modules/smartobject/include/functions.php";
+include_once XOOPS_ROOT_PATH . "/modules/smartobject/include/functions.php";
 include_once(SMARTOBJECT_ROOT_PATH . "class/adsense.php");
 
 $smartobject_adsense_handler = xoops_getModuleHandler('adsense', 'smartobject');

include/currency.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     $smartobject_currenciesObj = $smartobject_currency_handler->getCurrencies();
 }
 if (!$smartobject_currenciesArray) {
-    foreach($smartobject_currenciesObj as $currencyid=>$currencyObj) {
+    foreach ($smartobject_currenciesObj as $currencyid=>$currencyObj) {
         if ($currencyObj->getVar('default_currency', 'e')) {
             $smartobject_default_currency = $currencyObj;
         }

include/customtag.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 function smart_customtag_initiate() {
     global $xoopsTpl, $smartobject_customtag_handler;
     if (is_object($xoopsTpl)) {
-        foreach($smartobject_customtag_handler->objects as $k=>$v) {
+        foreach ($smartobject_customtag_handler->objects as $k=>$v) {
             $xoopsTpl->assign($k, $v->render());
         }
     }
@@ -25,7 +25,7 @@ 
 
 smart_loadLanguageFile('smartobject', 'customtag');
 
-include_once XOOPS_ROOT_PATH."/modules/smartobject/include/functions.php";
+include_once XOOPS_ROOT_PATH . "/modules/smartobject/include/functions.php";
 include_once(SMARTOBJECT_ROOT_PATH . "class/customtag.php");
 
 $smartobject_customtag_handler = xoops_getModuleHandler('customtag', 'smartobject');

include/xoops_core_common_functions.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 /* Debug functions to help developers :-)
  * Author : The SmartFactory
  */
-function xoops_debug_dumbQuery($msg='') {
+function xoops_debug_dumbQuery($msg = '') {
     global $xoopsDB;
     $xoopsDB->query('SELECT * ' . $msg . ' FROM dudewhereismycar2');
 }
@@ -26,13 +26,13 @@ 
     $smartfactory_query_count = 0;
 }
 
-function xoops_debug_getQueryCount($msg='')
+function xoops_debug_getQueryCount($msg = '')
 {
     global $smartfactory_query_count;
     return xoops_debug("xoops debug Query count ($msg): $smartfactory_query_count");
 }
 
-function xoops_debug($msg, $exit=false)
+function xoops_debug($msg, $exit = false)
 {
     echo "<div style='padding: 5px; color: red; font-weight: bold'>debug :: $msg</div>";
     if ($exit) {

include/captcha/captcha.php

Spacing +34 added lines, -34 removed lines

@@ -13,7 +13,7 @@ 
 
 class XoopsCaptcha {
     var $active	= true;
-    var $mode 	= "text";	// potential values: image, text
+    var $mode = "text"; // potential values: image, text
     var $config	= array();
 
     var $message = array(); // Logging error messages
@@ -21,7 +21,7 @@ 
     function XoopsCaptcha()
     {
         // Loading default preferences
-        $this->config = @include dirname(__FILE__)."/config.php";
+        $this->config = @include dirname(__FILE__) . "/config.php";
 
         $this->setMode($this->config["mode"]);
     }
@@ -29,7 +29,7 @@ 
     function &instance()
     {
         static $instance;
-        if(!isset($instance)) {
+        if (!isset($instance)) {
             $instance = new XoopsCaptcha();
         }
         return $instance;
@@ -37,11 +37,11 @@ 
 
     function setConfig($name, $val)
     {
-        if($name == "mode") {
+        if ($name == "mode") {
             $this->setMode($val);
-        }elseif(isset($this->$name)) {
+        }elseif (isset($this->$name)) {
             $this->$name = $val;
-        }else {
+        } else {
             $this->config[$name] = $val;
         }
         return true;
@@ -56,21 +56,21 @@ 
      */
     function setMode($mode = null)
     {
-        if( !empty($mode) && in_array($mode, array("text", "image")) ) {
+        if (!empty($mode) && in_array($mode, array("text", "image"))) {
             $this->mode = $mode;
 
-            if($this->mode != "image") {
+            if ($this->mode != "image") {
                 return;
             }
         }
 
         // Disable image mode
-        if(!extension_loaded('gd')) {
+        if (!extension_loaded('gd')) {
             $this->mode = "text";
-        }else{
+        } else {
             $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
-            foreach($required_functions as $func) {
-                if(!function_exists($func)) {
+            foreach ($required_functions as $func) {
+                if (!function_exists($func)) {
                     $this->mode = "text";
                     break;
                 }
@@ -85,15 +85,15 @@ 
     function init($name = 'xoopscaptcha', $skipmember = null, $num_chars = null, $fontsize_min = null, $fontsize_max = null, $background_type = null, $background_num = null)
     {
         // Loading RUN-TIME settings
-        foreach(array_keys($this->config) as $key) {
-            if(isset(${$key}) && ${$key} !== null) {
+        foreach (array_keys($this->config) as $key) {
+            if (isset(${$key}) && ${$key} !== null) {
                 $this->config[$key] = ${$key};
             }
         }
         $this->config["name"] = $name;
 
         // Skip CAPTCHA for member if set
-        if($this->config["skipmember"] && is_object($GLOBALS["xoopsUser"])) {
+        if ($this->config["skipmember"] && is_object($GLOBALS["xoopsUser"])) {
             $this->active = false;
         }
     }
@@ -105,34 +105,34 @@ 
     {
         $sessionName	= @$_SESSION['XoopsCaptcha_name'];
         $skipMember		= ($skipMember === null) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts	= intval( @$_SESSION['XoopsCaptcha_maxattempts'] );
+        $maxAttempts	= intval(@$_SESSION['XoopsCaptcha_maxattempts']);
 
         $is_valid = false;
 
         // Skip CAPTCHA for member if set
-        if( is_object($GLOBALS["xoopsUser"]) && !empty($skipMember) ) {
+        if (is_object($GLOBALS["xoopsUser"]) && !empty($skipMember)) {
             $is_valid = true;
             // Kill too many attempts
-        }elseif(!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_'.$sessionName] > $maxAttempts) {
+        }elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
             $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
 
             // Verify the code
-        }elseif(!empty($_SESSION['XoopsCaptcha_sessioncode'])){
+        }elseif (!empty($_SESSION['XoopsCaptcha_sessioncode'])) {
             $func = ($this->config["casesensitive"]) ? "strcmp" : "strcasecmp";
-            $is_valid = ! $func( trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
+            $is_valid = !$func(trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
         }
 
-        if(!empty($maxAttempts)) {
-            if(!$is_valid) {
+        if (!empty($maxAttempts)) {
+            if (!$is_valid) {
                 // Increase the attempt records on failure
-                $_SESSION['XoopsCaptcha_attempt_'.$sessionName]++;
+                $_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
                 // Log the error message
                 $this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
 
-            }else{
+            } else {
 
                 // reset attempt records on success
-                $_SESSION['XoopsCaptcha_attempt_'.$sessionName] = null;
+                $_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
             }
         }
         $this->destroyGarbage(true);
@@ -155,15 +155,15 @@ 
      */
     function destroyGarbage($clearSession = false)
     {
-        require_once dirname(__FILE__)."/".$this->mode.".php";
-        $class = "XoopsCaptcha".ucfirst($this->mode);
+        require_once dirname(__FILE__) . "/" . $this->mode . ".php";
+        $class = "XoopsCaptcha" . ucfirst($this->mode);
         $captcha_handler = new $class();
-        if(method_exists($captcha_handler, "destroyGarbage")) {
+        if (method_exists($captcha_handler, "destroyGarbage")) {
             $captcha_handler->loadConfig($this->config);
             $captcha_handler->destroyGarbage();
         }
 
-        if($clearSession) {
+        if ($clearSession) {
             $_SESSION['XoopsCaptcha_name'] = null;
             $_SESSION['XoopsCaptcha_skipmember'] = null;
             $_SESSION['XoopsCaptcha_sessioncode'] = null;
@@ -177,7 +177,7 @@ 
     {
         $form = "";
 
-        if( !$this->active || empty($this->config["name"]) ) {
+        if (!$this->active || empty($this->config["name"])) {
             return $form;
         }
 
@@ -192,10 +192,10 @@ 
          */
 
         // Fail on too many attempts
-        if(!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_'.$this->config["name"]] > $maxAttempts) {
+        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config["name"]] > $maxAttempts) {
             $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
             // Load the form element
-        }else{
+        } else {
             $form = $this->loadForm();
         }
 
@@ -204,8 +204,8 @@ 
 
     function loadForm()
     {
-        require_once dirname(__FILE__)."/".$this->mode.".php";
-        $class = "XoopsCaptcha".ucfirst($this->mode);
+        require_once dirname(__FILE__) . "/" . $this->mode . ".php";
+        $class = "XoopsCaptcha" . ucfirst($this->mode);
         $captcha_handler = new $class();
         $captcha_handler->loadConfig($this->config);
 

include/captcha/image.php

Spacing +7 added lines, -7 removed lines

@@ -6,7 +6,7 @@ 
  */
 
 class XoopsCaptchaImage {
-    var $config	= array();
+    var $config = array();
 
     function XoopsCaptchaImage()
     {
@@ -16,7 +16,7 @@ 
     function &instance()
     {
         static $instance;
-        if(!isset($instance)) {
+        if (!isset($instance)) {
             $instance = new XoopsCaptchaImage();
         }
         return $instance;
@@ -28,15 +28,15 @@ 
     function loadConfig($config = array())
     {
         // Loading default preferences
-        $this->config =& $config;
+        $this->config = & $config;
     }
 
     function render()
     {
-        $form = "<input type='text' name='".$this->config["name"]."' id='".$this->config["name"]."' size='" . $this->config["num_chars"] . "' maxlength='" . $this->config["num_chars"] . "' value='' /> &nbsp; ". $this->loadImage();
+        $form = "<input type='text' name='" . $this->config["name"] . "' id='" . $this->config["name"] . "' size='" . $this->config["num_chars"] . "' maxlength='" . $this->config["num_chars"] . "' value='' /> &nbsp; " . $this->loadImage();
         $rule = htmlspecialchars(XOOPS_CAPTCHA_REFRESH, ENT_QUOTES);
-        if($this->config["maxattempt"]) {
-            $rule .=  " | ". sprintf( constant("XOOPS_CAPTCHA_MAXATTEMPTS"), $this->config["maxattempt"] );
+        if ($this->config["maxattempt"]) {
+            $rule .= " | " . sprintf(constant("XOOPS_CAPTCHA_MAXATTEMPTS"), $this->config["maxattempt"]);
         }
         $form .= "&nbsp;&nbsp;<small>{$rule}</small>";
 
@@ -47,7 +47,7 @@ 
     function loadImage()
     {
         $rule = $this->config["casesensitive"] ? constant("XOOPS_CAPTCHA_RULE_CASESENSITIVE") : constant("XOOPS_CAPTCHA_RULE_CASEINSENSITIVE");
-        $ret = "<img id='captcha' src='" . XOOPS_URL. "/". $this->config["imageurl"]. "' onclick=\"this.src='" . XOOPS_URL. "/". $this->config["imageurl"]. "?refresh='+Math.random()"."\" align='absmiddle'  style='cursor: pointer;' alt='".htmlspecialchars($rule, ENT_QUOTES)."' />";
+        $ret = "<img id='captcha' src='" . XOOPS_URL . "/" . $this->config["imageurl"] . "' onclick=\"this.src='" . XOOPS_URL . "/" . $this->config["imageurl"] . "?refresh='+Math.random()" . "\" align='absmiddle'  style='cursor: pointer;' alt='" . htmlspecialchars($rule, ENT_QUOTES) . "' />";
 
         return $ret;
     }

include/captcha/scripts/img.php

Spacing +72 added lines, -72 removed lines

@@ -9,12 +9,12 @@ 
 error_reporting(0);
 $xoopsLogger->activated = false;
 
-if(empty($_SERVER['HTTP_REFERER']) || !preg_match("/^".preg_quote(XOOPS_URL, '/')."/", $_SERVER['HTTP_REFERER'])) {
+if (empty($_SERVER['HTTP_REFERER']) || !preg_match("/^" . preg_quote(XOOPS_URL, '/') . "/", $_SERVER['HTTP_REFERER'])) {
     exit();
 }
 
 class XoopsCaptchaImageHandler {
-    var $config	= array();
+    var $config = array();
     //var $mode = "gd"; // GD or bmp
     var $code;
     var $invalid = false;
@@ -26,16 +26,16 @@ 
 
     function XoopsCaptchaImageHandler()
     {
-        if(empty($_SESSION['XoopsCaptcha_name'])) {
+        if (empty($_SESSION['XoopsCaptcha_name'])) {
             $this->invalid = true;
         }
 
-        if(!extension_loaded('gd')) {
+        if (!extension_loaded('gd')) {
             $this->mode = "bmp";
-        }else{
+        } else {
             $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
-            foreach($required_functions as $func) {
-                if(!function_exists($func)) {
+            foreach ($required_functions as $func) {
+                if (!function_exists($func)) {
                     $this->mode = "bmp";
                     break;
                 }
@@ -49,7 +49,7 @@ 
     function setConfig($config = array())
     {
         // Loading default preferences
-        $this->config =& $config;
+        $this->config = & $config;
     }
 
     function loadImage()
@@ -64,34 +64,34 @@ 
      */
     function createCode()
     {
-        if($this->invalid) {
+        if ($this->invalid) {
             return;
         }
 
-        if($this->mode == "bmp") {
+        if ($this->mode == "bmp") {
             $this->config["num_chars"] = 4;
-            $this->code = rand( pow(10, $this->config["num_chars"] - 1), intval( str_pad("9", $this->config["num_chars"], "9") ) );
-        }else{
-            $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config["num_chars"] );
+            $this->code = rand(pow(10, $this->config["num_chars"] - 1), intval(str_pad("9", $this->config["num_chars"], "9")));
+        } else {
+            $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config["num_chars"]);
             if (!$this->config["casesensitive"]) {
-                $this->code = strtoupper( $this->code );
+                $this->code = strtoupper($this->code);
             }
         }
     }
 
     function setCode()
     {
-        if($this->invalid) {
+        if ($this->invalid) {
             return;
         }
 
-        $_SESSION['XoopsCaptcha_sessioncode'] = strval( $this->code );
-        $maxAttempts = intval( @$_SESSION['XoopsCaptcha_maxattempts'] );
+        $_SESSION['XoopsCaptcha_sessioncode'] = strval($this->code);
+        $maxAttempts = intval(@$_SESSION['XoopsCaptcha_maxattempts']);
 
         // Increase the attempt records on refresh
-        if(!empty($maxAttempts)) {
-            $_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']]++;
-            if($_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
+        if (!empty($maxAttempts)) {
+            $_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']]++;
+            if ($_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
                 $this->invalid = true;
             }
         }
@@ -99,15 +99,15 @@ 
 
     function createImage($file = "")
     {
-        if($this->invalid) {
+        if ($this->invalid) {
             header("Content-type: image/gif");
-            readfile(XOOPS_ROOT_PATH."/images/subject/icon2.gif");
+            readfile(XOOPS_ROOT_PATH . "/images/subject/icon2.gif");
             return;
         }
 
-        if($this->mode == "bmp") {
+        if ($this->mode == "bmp") {
             return $this->createImageBmp();
-        }else{
+        } else {
             return $this->createImageGd();
         }
     }
@@ -165,11 +165,11 @@ 
         $this->drawBorder();
         $this->drawCode();
 
-        if(empty($file)) {
+        if (empty($file)) {
             header("Content-type: image/jpeg");
-            imagejpeg ($this->oImage);
-        }else{
-            imagejpeg ($this->oImage, XOOPS_ROOT_PATH. "/". $this->config["imagepath"]. "/". $file . ".jpg");
+            imagejpeg($this->oImage);
+        } else {
+            imagejpeg($this->oImage, XOOPS_ROOT_PATH . "/" . $this->config["imagepath"] . "/" . $file . ".jpg");
         }
         imagedestroy($this->oImage);
     }
@@ -185,15 +185,15 @@ 
          }
          }
          */
-        require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
-        $file_path = $this->config["rootpath"]."/{$name}";
+        require_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
+        $file_path = $this->config["rootpath"] . "/{$name}";
         $files = XoopsLists::getFileListAsArray($file_path);
-        foreach( $files as $item) {
-            if ( empty($extension) || preg_match("/(\.{$extension})$/i",$item) ) {
+        foreach ($files as $item) {
+            if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
                 $items[] = $item;
             }
         }
-        if(function_exists("mod_createCacheFile")) {
+        if (function_exists("mod_createCacheFile")) {
             mod_createCacheFile($items, "captcha_{$name}", "captcha");
         }
         return $items;
@@ -202,7 +202,7 @@ 
     function loadFont()
     {
         $fonts = $this->_getList("fonts", "ttf");
-        $this->font = $this->config["rootpath"]."/fonts/".$fonts[array_rand($fonts)];
+        $this->font = $this->config["rootpath"] . "/fonts/" . $fonts[array_rand($fonts)];
     }
 
     function setImageSize()
@@ -215,12 +215,12 @@ 
         for ($Angle = -30; $Angle <= 30; $Angle++) {
             for ($i = 65; $i <= 90; $i++) {
                 $CharDetails = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
-                $_MaxCharWidth  = abs($CharDetails[0] + $CharDetails[2]);
-                if ($_MaxCharWidth > $MaxCharWidth ) {
+                $_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
+                if ($_MaxCharWidth > $MaxCharWidth) {
                     $MaxCharWidth = $_MaxCharWidth;
                 }
-                $_MaxCharHeight  = abs($CharDetails[1] + $CharDetails[5]);
-                if ($_MaxCharHeight > $MaxCharHeight ) {
+                $_MaxCharHeight = abs($CharDetails[1] + $CharDetails[5]);
+                if ($_MaxCharHeight > $MaxCharHeight) {
                     $MaxCharHeight = $_MaxCharHeight;
                 }
             }
@@ -228,8 +228,8 @@ 
         imagedestroy($oImage);
 
         $this->height = $MaxCharHeight + 2;
-        $this->spacing = (int)( ($this->config["num_chars"] * $MaxCharWidth) / $this->config["num_chars"]);
-        $this->width = ($this->config["num_chars"] * $MaxCharWidth) + ($this->spacing/2);
+        $this->spacing = (int) (($this->config["num_chars"] * $MaxCharWidth) / $this->config["num_chars"]);
+        $this->width = ($this->config["num_chars"] * $MaxCharWidth) + ($this->spacing / 2);
     }
 
     /**
@@ -240,8 +240,8 @@ 
     function loadBackground()
     {
         $RandBackground = null;
-        if( $backgrounds = $this->_getList("backgrounds", "(gif|jpg|png)") ) {
-            $RandBackground = $this->config["rootpath"]."/backgrounds/".$backgrounds[array_rand($backgrounds)];
+        if ($backgrounds = $this->_getList("backgrounds", "(gif|jpg|png)")) {
+            $RandBackground = $this->config["rootpath"] . "/backgrounds/" . $backgrounds[array_rand($backgrounds)];
         }
         return $RandBackground;
     }
@@ -251,9 +251,9 @@ 
      */
     function createFromFile()
     {
-        if ( $RandImage = $this->loadBackground() ) {
+        if ($RandImage = $this->loadBackground()) {
             $ImageType = @getimagesize($RandImage);
-            switch ( @$ImageType[2] ) {
+            switch (@$ImageType[2]) {
                 case 1:
                     $BackgroundImage = imagecreatefromgif($RandImage);
                     break;
@@ -267,7 +267,7 @@ 
                     break;
             }
         }
-        if(!empty($BackgroundImage)){
+        if (!empty($BackgroundImage)) {
             imagecopyresized($this->oImage, $BackgroundImage, 0, 0, 0, 0, imagesx($this->oImage), imagesy($this->oImage), imagesx($BackgroundImage), imagesy($BackgroundImage));
             imagedestroy($BackgroundImage);
         } else {
@@ -280,7 +280,7 @@ 
      */
     function drawCode()
     {
-        for ($i = 0; $i < $this->config["num_chars"] ; $i++) {
+        for ($i = 0; $i < $this->config["num_chars"]; $i++) {
             // select random greyscale colour
             $text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
 
@@ -294,10 +294,10 @@ 
             $FontSize = mt_rand($this->config["fontsize_min"], $this->config["fontsize_max"]);
 
             $CharDetails = imageftbbox($FontSize, $Angle, $this->font, $this->code[$i], array());
-            $CharHeight = abs( $CharDetails[1] + $CharDetails[5] );
+            $CharHeight = abs($CharDetails[1] + $CharDetails[5]);
 
             // calculate character starting coordinates
-            $posX = ($this->spacing/2) + ($i * $this->spacing);
+            $posX = ($this->spacing / 2) + ($i * $this->spacing);
             $posY = 2 + ($this->height / 2) + ($CharHeight / 4);
 
             imagefttext($this->oImage, $FontSize, $Angle, $posX, $posY, $text_color, $this->font, $this->code[$i], array());
@@ -310,8 +310,8 @@ 
     function drawBorder()
     {
         $rgb = rand(50, 150);
-        $border_color = imagecolorallocate ($this->oImage, $rgb, $rgb, $rgb);
-        imagerectangle($this->oImage, 0, 0, $this->width-1, $this->height-1, $border_color);
+        $border_color = imagecolorallocate($this->oImage, $rgb, $rgb, $rgb);
+        imagerectangle($this->oImage, 0, 0, $this->width - 1, $this->height - 1, $border_color);
     }
 
     /**
@@ -319,9 +319,9 @@ 
      */
     function drawCircles()
     {
-        for($i = 1; $i <= $this->config["background_num"]; $i++){
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imagefilledellipse($this->oImage, mt_rand(0,$this->width-10), mt_rand(0,$this->height-3), mt_rand(10,20), mt_rand(20,30),$randomcolor);
+        for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+            imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor);
         }
     }
 
@@ -331,7 +331,7 @@ 
     function drawLines()
     {
         for ($i = 0; $i < $this->config["background_num"]; $i++) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
             imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
         }
     }
@@ -342,8 +342,8 @@ 
     function drawRectangles()
     {
         for ($i = 1; $i <= $this->config["background_num"]; $i++) {
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imagefilledrectangle($this->oImage, mt_rand(0,$this->width), mt_rand(0,$this->height), mt_rand(0, $this->width), mt_rand(0,$this->height),  $randomcolor);
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+            imagefilledrectangle($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
         }
     }
 
@@ -352,14 +352,14 @@ 
      */
     function drawBars()
     {
-        for ($i= 0 ; $i <= $this->height;) {
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imageline( $this->oImage, 0, $i, $this->width, $i, $randomcolor );
+        for ($i = 0; $i <= $this->height;) {
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+            imageline($this->oImage, 0, $i, $this->width, $i, $randomcolor);
             $i = $i + 2.5;
         }
-        for ($i = 0;$i <= $this->width;) {
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imageline( $this->oImage, $i, 0, $i, $this->height, $randomcolor );
+        for ($i = 0; $i <= $this->width;) {
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+            imageline($this->oImage, $i, 0, $i, $this->height, $randomcolor);
             $i = $i + 2.5;
         }
     }
@@ -369,9 +369,9 @@ 
      */
     function drawEllipses()
     {
-        for($i = 1; $i <= $this->config["background_num"]; $i++){
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imageellipse($this->oImage, mt_rand(0,$this->width), mt_rand(0,$this->height), mt_rand(0,$this->width), mt_rand(0,$this->height), $randomcolor);
+        for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+            imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
         }
     }
 
@@ -380,12 +380,12 @@ 
      */
     function drawPolygons()
     {
-        for($i = 1; $i <= $this->config["background_num"]; $i++){
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+        for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
             $coords = array();
-            for ($j=1; $j <= $this->config["polygon_point"]; $j++) {
-                $coords[] = mt_rand(0,$this->width);
-                $coords[] = mt_rand(0,$this->height);
+            for ($j = 1; $j <= $this->config["polygon_point"]; $j++) {
+                $coords[] = mt_rand(0, $this->width);
+                $coords[] = mt_rand(0, $this->height);
             }
             imagefilledpolygon($this->oImage, $coords, $this->config["polygon_point"], $randomcolor);
         }
@@ -399,10 +399,10 @@ 
     {
         $image = "";
 
-        if(empty($file)) {
+        if (empty($file)) {
             header("Content-type: image/bmp");
             echo $image;
-        }else{
+        } else {
             return $image;
         }
     }

include/captcha/formcaptcha.php

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 	die("XOOPS root path not defined");
 }
 
-require_once XOOPS_ROOT_PATH."/class/xoopsform/formelement.php";
+require_once XOOPS_ROOT_PATH . "/class/xoopsform/formelement.php";
 
 /*
  * Usage
@@ -51,15 +51,15 @@ 
 	 *
 	 */
 	function XoopsFormCaptcha($caption = '', $name = 'xoopscaptcha', $skipmember = null, $numchar = null, $minfontsize = null, $maxfontsize = null, $backgroundtype = null, $backgroundnum = null) {
-		if(!class_exists("XoopsCaptcaha")) {
-			require_once SMARTOBJECT_ROOT_PATH."/include/captcha/captcha.php";
+		if (!class_exists("XoopsCaptcaha")) {
+			require_once SMARTOBJECT_ROOT_PATH . "/include/captcha/captcha.php";
 		}
 
-		$this->_captchaHandler =& XoopsCaptcha::instance();
+		$this->_captchaHandler = & XoopsCaptcha::instance();
 		$this->_captchaHandler->init($name, $skipmember, $numchar, $minfontsize, $maxfontsize, $backgroundtype, $backgroundnum);
-		if(!$this->_captchaHandler->active) {
+		if (!$this->_captchaHandler->active) {
 			$this->setHidden();
-		}else{
+		} else {
 			$caption = !empty($caption) ? $caption : $this->_captchaHandler->getCaption();
 			$this->setCaption($caption);
 		}
@@ -72,7 +72,7 @@ 
 
 	function render()
 	{
-		if(!$this->isHidden()) {
+		if (!$this->isHidden()) {
 			return $this->_captchaHandler->render();
 		}
 	}