optimacms 0.3.23 → 0.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 690ee2065fe5506fe47d0d36b7b269f8d5275d1f
-  data.tar.gz: a271a7b17bc0f75c9a85bbd4487412fd3abcbafa
+  metadata.gz: f0b9b2205c8bc82968042a97682ad648e2a08953
+  data.tar.gz: 02bd91769a57bae77c8ed131abcbdacf0e1c61fa
 SHA512:
-  metadata.gz: 96efee9837fded7f54c673d83868e00c82764c2d4a52fe96a16a1e6350ab846cae24c1266b349741093a6187ac1ca372afe14abd8b1b1656ea6c307449577c32
-  data.tar.gz: 619dd9d08990cd1b0134b99df617757a63237c1c213b667d09b0be796eb7a7cd0b27e37d9149ec4fb267c07f6476d05ef5a9d4791960cd63d33b8face2126001
+  metadata.gz: 13b733bdfcadfe1dcd9eae255cb35668018ef4dff2000d45e05c83b33b670043478017d754b64396139ce1a60ce0d678fc654983d7a4d077d7513f91919d5b8e
+  data.tar.gz: f6ac5bae985b6110ebb3630f3c541acb2392f6fc464a21f33051d7e2f37e3bf7df62b890b2f1fdfe075cdbab246c799155ec2f2a76e93e866d0cc8dcd969c9aa

data/app/assets/stylesheets/optimacms/application.scss

@@ -1,2 +1,9 @@
+// font-awesome
+@import "font_awesome";
 
+//
+@import "admin_variables";
+
+// Bootstrap and its default variables
+@import "bootstrap/scss/bootstrap";
 

data/app/controllers/optimacms/admin/backup_metadata_controller.rb

@@ -48,7 +48,10 @@ module Optimacms
 
       path = File.join(BackupMetadata::Backup.dir_backups, f)
 
-      send_data File.read(path), filename: f
+      #data = File.open(path, 'rb') { |f| f.read }
+      data = IO.read(path)
+      send_data data, filename: f
+      #send_file path
     end
 
     def delete

data/app/controllers/optimacms/admin/pages_controller.rb

@@ -11,6 +11,7 @@ module Optimacms
 
       #
       @parent_id = @filter.v('parent_id')
+      @parent_id = nil if @parent_id && @parent_id==0
       #@parent_id = (@parent_id || 0).to_i
       @parent = Page.find(@parent_id) rescue nil
 

data/app/controllers/optimacms/application_controller.rb

@@ -16,5 +16,18 @@ module Optimacms
       raise ActionController::RoutingError.new('Not Found')
     end
 
+
+    # devise
+    before_action :configure_permitted_parameters, if: :devise_controller?
+
+
+    protected
+
+    def configure_permitted_parameters
+      added_attrs = [:username, :email, :password, :password_confirmation, :remember_me]
+      devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
+      devise_parameter_sanitizer.permit :account_update, keys: added_attrs
+    end
+
   end
 end

data/app/models/optimacms/cms_admin_user.rb

@@ -5,9 +5,11 @@ module Optimacms
     # Include default devise modules. Others available are:
     # :confirmable, :lockable, :timeoutable and :omniauthable
     #devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
-    devise :database_authenticatable, :recoverable, :rememberable, :trackable
+    devise :database_authenticatable, :recoverable, :rememberable, :trackable,
+           authentication_keys: [:login]
     #, :validatable
 
+    attr_accessor :login
 
     # search
     searchable_by_simple_filter
@@ -20,13 +22,24 @@ module Optimacms
               :length       => { :minimum => 6 },
               :if           => :should_validate_password? # only validate if password changed!
 
+    validates :username,
+              presence: :true,
+              uniqueness: { case_sensitive: false }
+
+    # Only allow letter, number, underscore and punctuation.
+    #validates_format_of :username, with: /^[a-zA-Z0-9_\.]*$/, :multiline => true
+
+
     def should_validate_password?
       x = new_record? || !password.blank?
       #if: Proc.new{|obj| obj.new_record? || !obj.<attribute>.blank? }
     end
 
+    ### callbacks
+
     before_destroy :can_destroy?
 
+
     def can_destroy?
       !self.is_superadmin
     end
@@ -37,5 +50,22 @@ module Optimacms
     def is_superadmin?
       self.is_superadmin
     end
+
+
+
+
+    ### for login auth
+
+    def self.find_for_database_authentication(warden_conditions)
+      conditions = warden_conditions.dup
+      conditions[:email].downcase! if conditions[:email]
+
+      if login = conditions.delete(:login)
+        where(conditions.to_hash).where(["lower(username) = :value OR lower(email) = :value", { :value => login.downcase }]).first
+      elsif conditions.has_key?(:username) || conditions.has_key?(:email)
+        where(conditions.to_hash).first
+      end
+    end
+
   end
 end

data/app/models/optimacms/page.rb

@@ -2,18 +2,37 @@ module Optimacms
   class Page < ActiveRecord::Base
     self.table_name = 'cms_pages'
 
+
+    # relations
+
     belongs_to :layout, :foreign_key => 'layout_id', :class_name => 'Template'
     belongs_to :template, :foreign_key => 'template_id', :class_name => 'Template'
     belongs_to :folder, :foreign_key => 'parent_id', :class_name => 'Page'
     has_many :translations, :foreign_key => 'item_id', :class_name => 'PageTranslation', :dependent => :destroy
     accepts_nested_attributes_for :translations
-
     accepts_nested_attributes_for :template
 
     #has_many :page_translations
     #accepts_nested_attributes_for :page_translations
 
+    # validation
+    #validates :name, uniqueness: { scope: :w_page}
+
+    with_options unless: :is_folder? do |m|
+      m.validates :name, uniqueness: {
+          conditions: -> {
+            w_page
+          }
+      }
+    end
+
+    with_options if: :is_folder? do |m|
+      m.validates :name, uniqueness: { scope: :parent_id}
+    end
+
+
     # callbacks
+    before_save :_before_validate
     before_save :_before_save
 
     # modules
@@ -23,6 +42,8 @@ module Optimacms
 
     # scopes
     scope :of_parent, lambda {  |parent_id| where_parent(parent_id) }
+    scope :w_page, -> { where(is_folder: false) }
+    scope :w_folder, -> { where(is_folder: false) }
 
     #
     paginates_per 10
@@ -60,6 +81,17 @@ module Optimacms
     end
 
 
+    ### validate
+
+
+    ### callbacks
+
+
+    def _before_validate
+      self.parent_id = nil if self.parent_id && self.parent_id==0
+    end
+
+
     ### content
 
     def content(lang='')

data/app/views/cms_admin_users/sessions/new.html.haml

@@ -0,0 +1,43 @@
+
+.container
+  .row.justify-content-center
+    .col-xl-4.col-lg-4.col-md-6.col-12
+      .card
+        .card-body
+          %h3.card-title.text-uppercase
+            Admin Area
+          -#%h6.card-subtitle.mt-2.mb-2.text-muted
+            OptimaCMS Admin Area
+          -#%p.card-text
+
+          = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+            .form-group
+              = f.label :login
+              %br
+              = f.text_field :login, autofocus: true, class: 'form-control'
+
+            .form-group
+              = f.label :password
+              %br
+              = f.password_field :password, autocomplete: "off", class: 'form-control'
+
+            - if devise_mapping.rememberable?
+              .form-group
+                = f.check_box :remember_me
+                = f.label :remember_me
+
+            .actions
+              = f.submit "Log in", class: 'btn btn-primary btn-lg'
+
+              %p.mt-3
+                = render "devise/shared/links"
+
+            %hr.mt-2
+            %p
+              =link_to 'OptimaCMS', 'https://github.com/maxivak/optimacms'
+              v.#{Optimacms::Common::Common.version}
+
+
+
+
+

data/app/views/optimacms/admin/appdata/index.html.haml

@@ -5,7 +5,7 @@
 - @list.each do |content|
   %h2 #{content['name']}
   Storage:<br>
-  #{content['storage']['type']}
+  Type: #{content['storage']['type']}
   %br
   Dirs: #{content['dirs'].map{|r| r}.join(", ") }
   %br
@@ -71,14 +71,17 @@
 %h1 Help
 
 %b Save changes
-Save current changes to remote repo
+%br
+Save current changes to remote repo:
+%br
 * run on server
 %pre
-  name=NAME RAILS_ENV=#{Rails.env} rake appdata:save
+  RAILS_ENV=#{Rails.env} rake appdata:save['CONTENT_NAME']
 
 * run from local project
 %pre
-  cap #{Rails.env} deploy:appdata:server_save
+  name=CONTENT_NAME cap #{Rails.env} deploy:appdata:server_save
+
 
 %br
 %br
@@ -87,15 +90,13 @@ Save current changes to remote repo
 %b Get changes
 Get changes from remote repo
 %br
-
-or<br>
 * run on server
 %pre
-  name=NAME RAILS_ENV=#{Rails.env} rake appdata:update
+  name=CONTENT_NAME RAILS_ENV=#{Rails.env} rake appdata:update
 
-* run from local project
+* or run from local project
 %pre
-  cap #{Rails.env} deploy:appdata:server_update
+  name=CONTENT_NAME cap #{Rails.env} deploy:appdata:server_update
 
 
 

data/app/views/optimacms/admin/layouts/basic.html.haml

@@ -3,7 +3,7 @@
 
   .container-fluid.p-0.m-0
     .row.no-gutters
-      .col-lg-2
+      .col-sm-2
         = render 'optimacms/admin/shared/leftmenu'
       .col
         = render 'optimacms/admin/shared/breadcrumbs'

data/app/views/optimacms/admin/mediafiles/index.html.erb

@@ -4,9 +4,9 @@
   <title>File Manager</title>
 
 
-  <link rel="stylesheet" type="text/css" media="screen" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/themes/smoothness/jquery-ui.css" />
-  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
+  <link rel="stylesheet" type="text/css" media="screen" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/themes/smoothness/jquery-ui.css" />
+  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
 
 
   <script type="text/javascript" src="/elfinder/js/elfinder.min.js"></script>

data/app/views/optimacms/admin/pages/_form_folder.html.haml

@@ -6,6 +6,7 @@
   = f.input :parent_id, as: :hidden
   = f.input :is_folder, as: :hidden
 
+  = f.input :name, label: "Name", hint: 'only English letters'
   = f.input :title, label: "Title"
 
   - if @item.parent_id

data/config/initializers/devise.rb

@@ -0,0 +1,4 @@
+Devise.setup do |config|
+  config.scoped_views = true
+end
+

data/lib/optimacms/appdata/rsync_command.rb

@@ -0,0 +1,60 @@
+module Optimacms
+  module Appdata
+    class RsyncCommand
+
+
+      def self.build_cmd_with_ssh_save(storage, d_local_full, d_remote)
+        s_ssh = " #{storage['ssh_user']}@#{storage['host']}"
+        ssh_opts = build_ssh_opts(storage)
+
+        cmd_rsync = %Q(rsync -Lavrt -e "ssh #{ssh_opts}" #{d_local_full} #{s_ssh}:#{d_remote} --delete)
+
+        cmd = nil
+        if storage['ssh_key'] && storage['ssh_key']!=''
+          # use ssh key
+          cmd = cmd_rsync
+        else
+          # use sshpass with password
+          cmd = %Q(sshpass -p #{storage['ssh_password']} #{cmd_rsync})
+        end
+
+
+        cmd
+      end
+
+      def self.build_cmd_with_ssh_update(storage, d_local_full, d_remote)
+        s_ssh = " #{storage['ssh_user']}@#{storage['host']}"
+        ssh_opts = build_ssh_opts(storage)
+
+        cmd_rsync = %Q(rsync -Lavrt -e "ssh #{ssh_opts}" #{s_ssh}:#{d_remote} #{d_local_full} --delete)
+
+
+        cmd = nil
+        if storage['ssh_key'] && storage['ssh_key']!=''
+          # use ssh key
+          cmd = cmd_rsync
+        else
+          # use sshpass with password
+          cmd = %Q(sshpass -p #{storage['ssh_password']} #{cmd_rsync})
+        end
+
+
+        cmd
+      end
+
+
+      def self.build_ssh_opts(storage)
+        ssh_opts = "-p #{storage['ssh_port']||22} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+
+        if storage['ssh_key'] && storage['ssh_key']!=''
+          ssh_opts << " -i #{storage['ssh_key']}"
+        end
+
+        ssh_opts
+      end
+
+    end
+  end
+end
+
+

data/lib/optimacms/appdata/service.rb

@@ -142,13 +142,19 @@ module Optimacms
         storage = content['storage']
 
         #
-        s_ssh = " #{storage['ssh_user']}@#{storage['host']}"
-        ssh_opts = "-p #{storage['ssh_port']||22} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-        if storage['ssh_key'] && storage['ssh_key']!=''
-          ssh_opts << " -i #{storage['ssh_key']}"
-        end
-
+        cmd = SshCommand.new
+        ssh_options = {
+            port: storage['ssh_port'],
+            user: storage['ssh_user'],
+            password: storage['ssh_password'],
+            key: storage['ssh_key']
+        }
+
+        #s_ssh = " #{storage['ssh_user']}@#{storage['host']}"
+        #ssh_opts = "-p #{storage['ssh_port']||22} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+        #if storage['ssh_key'] && storage['ssh_key']!=''
+        #  ssh_opts << " -i #{storage['ssh_key']}"
+        #end
 
         # sync dirs
         content['dirs'].each do |d|
@@ -159,12 +165,19 @@ module Optimacms
 
 
           # create remote dir
-          %x[ssh -t #{ssh_opts} #{s_ssh} mkdir -p #{d_remote}]
+          #%x[ssh -t #{ssh_opts} #{s_ssh} mkdir -p #{d_remote}]
+          cmd_create = %Q(mkdir -p #{d_remote})
+          res_cmd_create = cmd.run_ssh_cmd(storage['host'], ssh_options, cmd_create)
+
+          if res_cmd_create[:res]!=1
+            raise "Cannot create dir: #{res_cmd_create[:error]}"
+          end
+
 
           # rsync
-          cmd = %Q(rsync -Lavrt -e "ssh #{ssh_opts}" #{d_local_full} #{s_ssh}:#{d_remote} --delete)
-          puts "#{cmd}"
-          %x[#{cmd}]
+          cmd_rsync = RsyncCommand.build_cmd_with_ssh_save(storage, d_local_full, d_remote)
+          #puts "#{cmd_rsync}"
+          output = %x[#{cmd_rsync}]
 
         end
 
@@ -182,16 +195,14 @@ module Optimacms
 
         #
         content = Optimacms::Appdata::Settings.get_content_info(_env, content_name)
-        #puts "content: #{content}"
         storage = content['storage']
 
         #
-        s_ssh = " #{storage['ssh_user']}@#{storage['host']}"
-        ssh_opts = "-p #{storage['ssh_port']||22} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-        if storage['ssh_key'] && storage['ssh_key']!=''
-          ssh_opts << " -i #{storage['ssh_key']}"
-        end
+        #s_ssh = " #{storage['ssh_user']}@#{storage['host']}"
+        #ssh_opts = "-p #{storage['ssh_port']||22} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+        #if storage['ssh_key'] && storage['ssh_key']!=''
+        #  ssh_opts << " -i #{storage['ssh_key']}"
+        #end
 
 
         # sync dirs
@@ -200,13 +211,16 @@ module Optimacms
           d_local = File.join(File.dirname(d), File.basename(d))+"/"
           d_local_full = File.join(Rails.root, d_local)
 
-          #
+          # create local dir
           %x[mkdir -p #{d_local_full}]
 
+
           # rsync
-          cmd = %Q(rsync -Lavrt -e "ssh #{ssh_opts}" #{s_ssh}:#{d_remote} #{d_local_full} --delete)
-          puts "#{cmd}"
-          %x[#{cmd}]
+          cmd_rsync = RsyncCommand.build_cmd_with_ssh_update(storage, d_local_full, d_remote)
+          #puts "#{cmd_rsync}"
+          output = %x[#{cmd_rsync}]
+
+          #cmd = %Q(rsync -Lavrt -e "ssh #{ssh_opts}" #{s_ssh}:#{d_remote} #{d_local_full} --delete)
 
         end
 
@@ -259,18 +273,18 @@ module Optimacms
           d_to = File.join(repo_local_path, d)
           d_to_base = File.dirname(d_to)
 
-          puts "copy from #{d_from} to #{d_to}"
+          #puts "copy from #{d_from} to #{d_to}"
 
           FileUtils.mkdir_p d_to
 
           # rsync or copy
           if res_rsync!=""
             cmd = %Q(rsync -Lavrt #{d_from}/ #{d_to}/)
-            puts "#{cmd}"
+            #puts "#{cmd}"
             %x(#{cmd})
           else
             # no rsync
-            puts "no rsync. copying..."
+            #puts "no rsync. copying..."
 
             FileUtils.cp_r d_from, d_to_base
           end