Changeset 45 for branches

Timestamp:

02/14/09 11:18:08 (3 years ago)

Author:

daris

Message:

adding go_to_page extension

Location:

branches

Files:

• ajax_post_edit/ajax_post_edit.js (modified) (2 diffs)
• ajax_post_edit/edit.php (modified) (1 diff)
• download/admin/download.php (modified) (3 diffs)
• download/download.php (modified) (3 diffs)
• download/install.php (modified) (1 diff)
• download/submit_download.php (modified) (2 diffs)
• go_to_page (added)
• go_to_page/manifest.xml (added)
• go_to_page/scripts.js (added)
• go_to_page/style.css (added)
• lang_editor/admin/lang_editor.php (modified) (3 diffs)
• lang_editor/include/functions.php (modified) (3 diffs)
• style_switcher/manifest.xml (modified) (1 diff)

branches/ajax_post_edit/ajax_post_edit.js

@@ -20 +20 @@
                 // if other post is editing, cancel edit
                 if (ape_id != id && ape_id != -1)
-                        ape_cancel_edit(ape_id);
+                {
+                        if (confirm("Are you sure you want to cancel last edit?"))
+                                ape_cancel_edit(ape_id);
+                        else
+                        {
+                                ape_hide_menu();
+                                return;
+                        }
+                }
 
                 if (ape_id != id)
@@ -60 +68 @@
 
         $('postedit').style.height = textAreaHeight + 'px';
+        $('postedit').focus();
 }
 

branches/ajax_post_edit/edit.php

@@ -100 +100 @@
                         <div style="margin-top: 5px">
                                 <div style="float:right; display:none" id="edit_info">
-                                        <img src="extensions/ajax_post_edit/loading.gif" /> <?php echo $lang_ape['Saving'] ?>
+                                        <img src="<?php echo $base_url ?>/extensions/ajax_post_edit/loading.gif" /> <?php echo $lang_ape['Saving'] ?>
                                 </div>
                                 <input type="button" onclick="ape_update_post(<?php echo $id ?>)" value="<?php echo $lang_ape['Update'] ?>" id="btn_updatePost" />

branches/download/admin/download.php

@@ -210 +210 @@
                 $approved = isset($_POST['approved']) ? 1 : 0;
 
+                
                 if ($name == '')
                         message($lang_admin_download['Must enter download message']);
 
-                if (is_uploaded_file($_FILES['file_upload']['tmp_name']))
+
+/*              if (is_uploaded_file($_FILES['file_upload']['tmp_name']))
                 {
                         $file_upload = $_FILES['file_upload']['name'];
@@ -223 +225 @@
                         move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$download_id.'.zip');
                 }
+        */
         
-/*              if (isset($_FILES['file_upload']) && is_uploaded_file($_FILES['file_upload']['tmp_name']))
+                $query = array(
+                        'UPDATE'        => 'downloads',
+                        'SET'           => 'name=\''.$forum_db->escape($name).'\', description=\''.$forum_db->escape($description).'\', cat='.$cat.', version=\''.$forum_db->escape($version).'\', author=\''.$forum_db->escape($author).'\', approved='.$approved,
+                        'WHERE'         => 'id='.$download_id
+                );
+                
+                if (isset($_FILES['file_upload']) && is_uploaded_file($_FILES['file_upload']['tmp_name']))
                 {
                         $file_upload = $_FILES['file_upload']['name'];
                         $file_ext = substr($file_upload, strrpos($file_upload, '.')+1);
                 
-                        if ($file_ext != 'zip')
+                        $allowed_ext = array('zip', 'rar');
+                        if (!in_array($file_ext, $allowed_ext))
                                 message($lang_admin_download['Invalid extension']);
                         
@@ -246 +256 @@
                                 $file = $_FILES['file_upload']['name'];
 
+                        $file = str_replace(' ', '_', strtolower($file));
+                        $file = preg_replace('/[^0-9a-z\._]/', '', $file);
+
                         move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$file);
-                }*/
-
-                $query = array(
-                        'UPDATE'        => 'downloads',
-                        'SET'           => 'name=\''.$forum_db->escape($name).'\', description=\''.$forum_db->escape($description).'\', cat='.$cat.', version=\''.$forum_db->escape($version).'\', author=\''.$forum_db->escape($author).'\', approved='.$approved,
-                        'WHERE'         => 'id='.$download_id
-                );
-
-                // If uploaded new file, reset downloads counter
-                if (isset($_FILES['file_upload']) && is_uploaded_file($_FILES['file_upload']['tmp_name']))
-                        $query['SET'] .= ', downloads=0';
+                        $query['SET'] .= ', downloads=0, file=\''.$forum_db->escape($file).'\'';
+                }
 
                 ($hook = get_hook('afo_save_forum_qr_update_forum')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;

branches/download/download.php

@@ -24 +24 @@
         // Fetch list of downloads
         $query = array(
-                'SELECT'        => 'd.name, d.version',
+                'SELECT'        => 'd.name, d.version, d.file',
                 'FROM'          => 'downloads AS d',
                 'WHERE'         => 'd.id=\''.$id.'\'',
@@ -41 +41 @@
         $cur_file = $forum_db->fetch_assoc($result);
 
-        $file = DOWNLOAD.'files/'.$id.'.zip';
-
-        if (!file_exists($file))
+        if (!file_exists(DOWNLOAD.'files/'.$cur_file['file']))
                 message($lang_download['File not found']);
         
@@ -56 +54 @@
         $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
         
-        $version = ($cur_file['version'] != '' ? '_'.$cur_file['version'] : '');
-        $url = strtolower($cur_file['name'].$version.'.zip');
-        $url = str_replace(' ', '_', $url);
-        $url = preg_replace('/[^0-9a-z\._]/', '', $url);
-        
-        //@ob_end_clean(); //turn off output buffering to decrease cpu usage
-        header('Content-Type: application/zip');
+//      $version = ($cur_file['version'] != '' ? '_'.$cur_file['version'] : '');
+/*      $filename = str_replace(' ', '_', $filename);
+        $filename = preg_replace('/[^0-9a-z\._]/', '', $filename);
+        */
+        
+/*      header('Content-Type: application/zip');
         header('Content-Disposition: attachment; filename="'.rawurldecode($url).'"');
-/*      header("Content-Transfer-Encoding: binary");
-        header('Accept-Ranges: bytes');*/
+    header("Content-Transfer-Encoding: binary");
         header("Content-Length: ".filesize($file));
         
         // The three lines below basically make the download non-cacheable 
-        header("Cache-control: private");
+        header("Cache-control: public");
+    header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
         header('Pragma: private');
         header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-        
-        $chunksize = 1*(1024*1024); //you may want to change this
-        if ($file = fopen($file, 'r'))
-        {
-                if(isset($_SERVER['HTTP_RANGE']))
-                        fseek($file, $range);
-                 
-                while(!feof($file))
-                {
-                        $buffer = fread($file, $chunksize);
-                        print($buffer); //echo($buffer); // is also possible
-                        flush();
-                        $bytes_send += strlen($buffer);
-                }
-                fclose($file);
-        } 
-        else
-                message('Error - can not open file.');
-
+
+        readfile($file);*/
+        
+        header('Location: '.$base_url.'/extensions/download/files/'.$cur_file['file']);
         exit;
+
 }
 elseif (isset($cat))

branches/download/install.php

@@ -21 +21 @@
         {
                 // do upgrade...
+                if (EXT_CUR_VERSION == '1.0')
+                {
+                        $forum_db->add_field('downloads', 'file', 'VARCHAR(255)', false);
 
+                        $query = array(
+                                'SELECT'        => 'name, version, id',
+                                'FROM'          => 'downloads',
+                        );
+                        $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
+                        
+                        while ($cur_download = $forum_db->fetch_assoc($result))
+                        {
+                                $version = ($cur_download['version'] != '' ? '_'.$cur_download['version'] : '');
+                                $filename = $cur_download['name'].$version.'.zip';
+                                $filename = str_replace(' ', '_', strtolower($filename));
+                                $filename = preg_replace('/[^0-9a-z\._]/', '', $filename);
+        
+                                $query2 = array(
+                                        'UPDATE'        => 'downloads',
+                                        'SET'           => 'file=\''.$forum_db->escape($filename).'\'',
+                                        'WHERE'         => 'id=\''.$cur_download['id'].'\'',
+                                );
+                                $result2 = $forum_db->query_build($query2) or error(__FILE__, __LINE__);
+                                
+                                rename(FORUM_ROOT.'extensions/download/files/'.$cur_download['id'].'.zip', FORUM_ROOT.'extensions/download/files/'.$filename);
+                        }
+
+                }
 
         }

branches/download/submit_download.php

@@ -44 +44 @@
         $file_ext = substr($file_upload, strrpos($file_upload, '.')+1);
         
-        if ($file_ext != 'zip')
+        $allowed_ext = array('zip', 'rar');
+        if (!in_array($file_ext, $allowed_ext))
                 message($lang_admin_download['Invalid extension']);
                 
-/*              if (file_exists(DOWNLOAD.'files/'.$file_upload))
-                {
-                        // Get new name for file
-                        $filename = substr($file_upload, 0, strrpos($file_upload, '.'));
-                        $ext = substr($file_upload, strrpos($file_upload, '.'));
-                        $i = 1;
-                        while (file_exists(DOWNLOAD.'files/'.$filename.'_'.$i.$ext))
-                                $i++;
-                        $file = $filename.'_'.$i.$ext;
-                }
-                else
-                        $file = $_FILES['file_upload']['name'];*/
+        if (file_exists(DOWNLOAD.'files/'.$file_upload))
+        {
+                // Get new name for file
+                $filename = substr($file_upload, 0, strrpos($file_upload, '.'));
+                $ext = substr($file_upload, strrpos($file_upload, '.'));
+                $i = 1;
+                while (file_exists(DOWNLOAD.'files/'.$filename.'_'.$i.$ext))
+                        $i++;
+                $file = $filename.'_'.$i.$ext;
+        }
+        else
+                $file = $_FILES['file_upload']['name'];
+
+        $file = str_replace(' ', '_', strtolower($file));
+        $file = preg_replace('/[^0-9a-z\._]/', '', $file);
+
+        move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$file);
         
         $query = array(
-                'INSERT'        => 'name, description, cat, author, version, user_id, added',
+                'INSERT'        => 'name, description, cat, author, version, user_id, added, file',
                 'INTO'          => 'downloads',
-                'VALUES'        => '\''.$forum_db->escape($name).'\', \''.$forum_db->escape($description).'\', '.$cat.', \''.$forum_db->escape($author).'\', \''.$forum_db->escape($version).'\', \''.$forum_db->escape($forum_user['id']).'\', '.time(),
+                'VALUES'        => '\''.$forum_db->escape($name).'\', \''.$forum_db->escape($description).'\', '.$cat.', \''.$forum_db->escape($author).'\', \''.$forum_db->escape($version).'\', \''.$forum_db->escape($forum_user['id']).'\', '.time().', \''.$forum_db->escape($file).'\'',
         );
         
@@ -74 +80 @@
         ($hook = get_hook('afo_save_forum_qr_update_forum')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
         $forum_db->query_build($query) or error(__FILE__, __LINE__);
-
-        move_uploaded_file($_FILES['file_upload']['tmp_name'], DOWNLOAD.'files/'.$forum_db->insert_id().'.zip');
 
         ($hook = get_hook('afo_save_forum_pre_redirect')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;

branches/lang_editor/admin/lang_editor.php

@@ -131 +131 @@
                 message('Your server does not support Zip Archive');
         
-        // Get version
-        $version = get_extension_version($ext);
-
-        $exclude_langs = isset($_GET['exclude']) ? explode(',', $_GET['exclude']) : array();
+
+        $exclude = isset($_GET['exclude']) ? explode(',', $_GET['exclude']) : array();
 
         if ($ext)
-                $filename = $ext.'_'.$version;
+                $filename = $ext.'_'.get_extension_version($ext);
         elseif ($lang)
                 $filename = $lang;
@@ -144 +142 @@
         
         if (file_exists($archive))
-                @unlink($arcive);
+                @unlink($archive);
         
         $zip = new ZipArchive();
@@ -152 +150 @@
                         add_dir_to_archive(FORUM_ROOT.'extensions/', $ext);
                 elseif ($lang)
-                        add_dir_to_archive(FORUM_ROOT.'lang/', $lang);
+                {
+                        exec('rm -rf '.EXT_ROOT.'cache/export', $res);
+                        @mkdir(EXT_ROOT.'cache/export');
+                        @mkdir(EXT_ROOT.'cache/export/extensions');
+                        @mkdir(EXT_ROOT.'cache/export/lang');
+                        @mkdir(EXT_ROOT.'cache/export/lang/'.$lang);
+
+                        $extensions_dir = FORUM_ROOT.'extensions';
+                        $d = dir($extensions_dir);
+                        while ($f = $d->read())
+                        {
+                                if (substr($f, 0, 1) != '.' && !preg_match('#.diff$#', $f))
+                                {
+                                        // it's extension dir
+                                        $ext_dir = $extensions_dir.'/'.$f;
+                                        if (substr($f, 0, 4) == 'pun_' && is_dir($ext_dir) && file_exists($ext_dir.'/lang/'.$lang) && is_dir($ext_dir.'/lang/'.$lang))
+                                        {
+                                                @mkdir(EXT_ROOT.'cache/export/extensions/'.$f);
+                                                @mkdir(EXT_ROOT.'cache/export/extensions/'.$f.'/lang/');
+                                                copy_dir($ext_dir.'/lang/'.$lang, EXT_ROOT.'cache/export/extensions/'.$f.'/lang/'.$lang);
+                                        }
+                                }
+                        }
+                        
+                        copy_dir(FORUM_ROOT.'/lang/'.$lang, EXT_ROOT.'cache/export/lang/'.$lang);
+
+                        add_dir_to_archive(EXT_ROOT.'cache/export', 'extensions');
+                        add_dir_to_archive(EXT_ROOT.'cache/export', 'lang');
+                        $zip->addFile(FORUM_ROOT.'Readme.txt', 'Readme.txt');
+                }
                 
                 $zip->close();
-                
                 header('Location: '.$archive);
         } 

branches/lang_editor/include/functions.php

@@ -154 +154 @@
 function add_dir_to_archive($directory, $subdir = '')
 {
-        global $zip, $exclude_langs;
+        global $zip, $exclude;
         
         $dir = dir($directory.'/'.$subdir);
@@ -161 +161 @@
                 if (substr($file, 0, 1) != '.' && !preg_match('#.diff$#', $file))
                 {
-                        if (is_dir($directory.'/'.$subdir.'/'.$file) && !in_array($file, $exclude_langs))
+                        if (is_dir($directory.'/'.$subdir.'/'.$file) && !in_array($file, $exclude))
                         {
                                 $zip->addEmptyDir($subdir.'/'.$file);
@@ -171 +171 @@
         }
 }
+
+
+function copy_dir($source, $dest)
+{
+        if (!file_exists($dest))
+                mkdir($dest);
+
+        $d = dir($source);
+        while ($f = $d->read())
+        {
+                if (substr($f, 0, 1) != '.' && !preg_match('#.diff$#', $f))
+                {
+                        if (!is_dir($source.'/'.$f))
+                                copy($source.'/'.$f, $dest.'/'.$f);
+                        else
+                                copy_dir($source.'/'.$f, $dest.'/'.$f);
+                }
+        }
+}

branches/style_switcher/manifest.xml

@@ -4 +4 @@
         <id>style_switcher</id>
         <title>Style Switcher</title>
-        <version>1.1</version>
+        <version>1.2</version>
         <description>Allows users/guests select style</description>
         <author>daris</author>
         <minversion>1.3</minversion>
-        <maxtestedon>1.3 Beta</maxtestedon>
+        <maxtestedon>1.3.2</maxtestedon>
 
         <hooks>