shortener setup fix

voitto · Sep 6, 2009 · 6756a5f · 6756a5f
1 parent baf18ce
commit 6756a5f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/app/omb/controllers/identities.php b/app/omb/controllers/identities.php
@@ -513,7 +513,7 @@ function app_installer_json( &$vars ) {
     $result = false;
     $result = curl_exec( $curl );
     if ($result) {
-      $data = unserialize($result);
+      $data = mb_unserialize($result);
       foreach($data as $appname=>$appdata) {
         $remote_list[$appname] = $appname;
       }

diff --git a/app/omb/plugins/omb.php b/app/omb/plugins/omb.php
@@ -475,7 +475,7 @@ function set_identity_from_nick(&$request,&$route) {
     $Revision->set_param( 'find_by', $where );
     $Revision->find();
     while ($r = $Revision->MoveNext()) {
-      $i = unserialize($r->data);
+      $i = mb_unserialize($r->data);
       if (is_object($i) && $nick == $i->nickname)
         $id = $i->id;
     }

diff --git a/app/omb/plugins/wp.php b/app/omb/plugins/wp.php
@@ -817,7 +817,7 @@ function get_option( $opt ) {
     $Setting =& $db->model('Setting');
     $s = $Setting->find_by(array('name'=>$opt,'profile_id'=>get_profile_id()));
     if ($s) {
-      $un = @unserialize(base64_decode($s->value));
+      $un = mb_unserialize(base64_decode($s->value));
       if (is_array($un))
         return $un;
       return $s->value;

diff --git a/app/translate/controllers/translations.php b/app/translate/controllers/translations.php
@@ -113,7 +113,7 @@ function _index( &$vars ) {
   $status = array();
 
   while ($lang = $collection->MoveNext()) {
-    $txt = unserialize($lang->data);
+    $txt = mb_unserialize($lang->data);
     $thiscount = 0;
     foreach($txt as $phrase=>$trans) {
       if (!empty($trans)) {

diff --git a/app/translate/views/translations/_edit.html b/app/translate/views/translations/_edit.html
@@ -30,7 +30,7 @@
   <p><b>spacebefore]</b> and <b>[spaceafter</b> indicate the presence of a space character before or after the string</p>
 </td>
 </tr>
-		  <?php if (!empty($Member->data)) { $arrdata = unserialize($Member->data); } ?>
+		  <?php if (!empty($Member->data)) { $arrdata = mb_unserialize($Member->data); } ?>
 		<?php foreach ($template_fields as $field) : ?>
 		  <tr>
 		    <td><input name="trans_<?php echo $field; ?>" value="<?php if (isset($arrdata[$field])) echo $arrdata[$field]; ?>"></td>

diff --git a/db/library/dbscript/_functions.php b/db/library/dbscript/_functions.php
@@ -3064,3 +3064,8 @@ function mu_url() {
     return true;
   return false;
 }
+
+function mb_unserialize($serial_str) {
+  $out = preg_replace('!s:(\d+):"(.*?)";!se', "'s:'.strlen('$2').':\"$2\";'", $serial_str );
+  return unserialize($out);    
+}
diff --git a/db/library/remy-tweed/cron.php b/db/library/remy-tweed/cron.php
@@ -178,7 +178,7 @@
 foreach ($env as $key=>$val) {
   if (substr($key,0,13) == 'importtwitter' && $val == 1) {
     $optname = 'conf_for_'.$key;
-    $options = unserialize(get_option($optname));
+    $options = get_option($optname);
     if (!$options) {
       $options = array();
       $options['busy'] = 0;

diff --git a/wp-content/language/lang_chooser.php b/wp-content/language/lang_chooser.php
@@ -18,7 +18,7 @@
   $Translation =& $db->model('Translation');
   $lang = $Translation->find_by('code',$language_selected);
   if ($lang)
-    $txt = unserialize($lang->data);
+    $txt = mb_unserialize($lang->data);
 
 }