Changeset 12619

Timestamp:

Nov 13, 2011, 1:19:28 PM (12 years ago)

Author:

mistic100

Message:

fix display on some themes, disable on ContactForm for simple and stripped themes (stupid bug)

Location:

extensions/CryptograPHP

Files:

• admin.php (modified) (1 diff)
• include/category.inc.php (modified) (2 diffs)
• include/picture.inc.php (modified) (2 diffs)
• include/register.inc.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• securimage/securimage_show.php (modified) (1 diff)

extensions/CryptograPHP/admin.php

@@ -2 +2 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-$conf['cryptographp'] = unserialize($conf['cryptographp']);
+// $conf['cryptographp'] = unserialize($conf['cryptographp']);
 load_language('plugin.lang', CRYPTO_PATH);
 

extensions/CryptograPHP/include/category.inc.php

@@ -18 +18 @@
   global $conf;
   
-  $search = '<input type="hidden" name="key" value="{$comment_add.KEY}">';
-  $replace = $search.'
+  $search = '#<input type="hidden" name="key" value="{\$comment_add\.KEY}"([ /]*)>#';
+  $replace = '<input type="hidden" name="key" value="{$comment_add.KEY}"$1>'.'
   <label>
     <img id="captcha" src="'.CRYPTO_PATH.'securimage/securimage_show.php" alt="CAPTCHA Image">
@@ -29 +29 @@
   </label>';
 
-  return str_replace($search, $replace, $content);
+  return preg_replace($search, $replace, $content);
 }
 

extensions/CryptograPHP/include/picture.inc.php

@@ -18 +18 @@
   global $conf;
   
-  $search = '<input type="hidden" name="key" value="{$comment_add.KEY}">';
-  $replace = $search.'
+  $search = '#<input type="hidden" name="key" value="{\$comment_add\.KEY}"([ /]*)>#';
+  $replace = '<input type="hidden" name="key" value="{$comment_add.KEY}"$1>'.'
   <label>
     <img id="captcha" src="'.CRYPTO_PATH.'securimage/securimage_show.php" alt="CAPTCHA Image">
@@ -29 +29 @@
   </label>';
 
-  return str_replace($search, $replace, $content);
+  return preg_replace($search, $replace, $content);
 }
 

extensions/CryptograPHP/include/register.inc.php

@@ -20 +20 @@
       <li>
         <span class="property">
-          <label><img id="captcha" src="'.CRYPTO_PATH.'securimage/securimage_show.php" alt="CAPTCHA Image"></label>
+          <label>{\''.($conf['cryptographp']['captcha_type']=='string'?'Enter code':'Solve equation').'\'|@translate} <img id="captcha" src="'.CRYPTO_PATH.'securimage/securimage_show.php" alt="CAPTCHA Image"></label>
         </span>
-        <b>{\''.($conf['cryptographp']['captcha_type']=='string'?'Enter code':'Solve equation').'\'|@translate} :</b><br>
         <input type="text" name="captcha_code" size="'.($conf['cryptographp']['code_length']+1).'" maxlength="'.$conf['cryptographp']['code_length'].'" />
         <a href="#" onclick="document.getElementById(\'captcha\').src = \''.CRYPTO_PATH.'securimage/securimage_show.php?\' + Math.random(); return false">

extensions/CryptograPHP/main.inc.php

@@ -21 +21 @@
 define('CRYPTO_PATH' , PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
 
-add_event_handler('loc_end_section_init', 'crypto_init');
+add_event_handler('init', 'crypto_init');
+add_event_handler('loc_end_section_init', 'crypto_section_init');
 
 function crypto_init()
 {
-  global $conf, $pwg_loaded_plugins, $page;
+  global $conf, $user;
   
   $conf['cryptographp'] = unserialize($conf['cryptographp']);
@@ -38 +39 @@
     include(CRYPTO_PATH.'include/picture.inc.php');
   }
-  else if (isset($_GET['/contact'])) 
+  // because of ContactForm specificities, Captcha can't be displayed on these themes
+  else if ( isset($_GET['/contact']) and strstr($user['theme'], 'simple') === false and strstr($user['theme'], 'stripped') === false ) 
   {
     include(CRYPTO_PATH.'include/contactform.inc.php');
   }
-  else if (
+}
+
+function crypto_section_init()
+{
+  global $conf, $pwg_loaded_plugins, $page;
+  
+  if (
     script_basename() == 'index' and $conf['cryptographp']['comments_action'] != 'inactive' and 
     isset($pwg_loaded_plugins['Comments_on_Albums']) and isset($page['section']) and 

extensions/CryptograPHP/securimage/securimage_show.php

@@ -49 +49 @@
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
 
-$conf['cryptographp'] = unserialize($conf['cryptographp']);
+// $conf['cryptographp'] = unserialize($conf['cryptographp']);
 
 // randomize colors